projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04a3157
)
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
author
Tim Goya
<tuxdev103@gmail.com>
Sat, 25 Aug 2007 21:56:34 +0000
(21:56 +0000)
committer
Tim Goya
<tuxdev103@gmail.com>
Sat, 25 Aug 2007 21:56:34 +0000
(21:56 +0000)
SVN-Revision: 5158
src/video/drawing_context.cpp
patch
|
blob
|
history
src/video/gl_lightmap.cpp
patch
|
blob
|
history
src/video/gl_renderer.cpp
patch
|
blob
|
history
src/video/lightmap.hpp
patch
|
blob
|
history
src/video/renderer.hpp
patch
|
blob
|
history
src/video/sdl_lightmap.cpp
patch
|
blob
|
history
src/video/sdl_renderer.cpp
patch
|
blob
|
history
diff --git
a/src/video/drawing_context.cpp
b/src/video/drawing_context.cpp
index
de45b4f
..
7ca3e26
100644
(file)
--- a/
src/video/drawing_context.cpp
+++ b/
src/video/drawing_context.cpp
@@
-346,7
+346,11
@@
DrawingContext::handle_drawing_requests(DrawingRequests& requests)
renderer->draw_gradient(request);
break;
case TEXT:
renderer->draw_gradient(request);
break;
case TEXT:
- renderer->draw_text(request);
+ {
+ const TextRequest* textrequest = (TextRequest*) request.request_data;
+ textrequest->font->draw(renderer, textrequest->text, request.pos,
+ textrequest->alignment, request.drawing_effect, request.alpha);
+ }
break;
case FILLRECT:
renderer->draw_filled_rect(request);
break;
case FILLRECT:
renderer->draw_filled_rect(request);
@@
-368,7
+372,11
@@
DrawingContext::handle_drawing_requests(DrawingRequests& requests)
lightmap->draw_gradient(request);
break;
case TEXT:
lightmap->draw_gradient(request);
break;
case TEXT:
- lightmap->draw_text(request);
+ {
+ const TextRequest* textrequest = (TextRequest*) request.request_data;
+ textrequest->font->draw(renderer, textrequest->text, request.pos,
+ textrequest->alignment, request.drawing_effect, request.alpha);
+ }
break;
case FILLRECT:
lightmap->draw_filled_rect(request);
break;
case FILLRECT:
lightmap->draw_filled_rect(request);
diff --git
a/src/video/gl_lightmap.cpp
b/src/video/gl_lightmap.cpp
index
537a6a9
..
014fb73
100644
(file)
--- a/
src/video/gl_lightmap.cpp
+++ b/
src/video/gl_lightmap.cpp
@@
-266,15
+266,6
@@
namespace GL
}
void
}
void
- Lightmap::draw_text(const DrawingRequest& /*request*/)
- {
- //const TextRequest* textrequest = (TextRequest*) request.request_data;
-
- //textrequest->font->draw(textrequest->text, request.pos,
- // textrequest->alignment, request.drawing_effect, request.alpha);
- }
-
- void
Lightmap::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
Lightmap::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
diff --git
a/src/video/gl_renderer.cpp
b/src/video/gl_renderer.cpp
index
6fb6480
..
3eee8f1
100644
(file)
--- a/
src/video/gl_renderer.cpp
+++ b/
src/video/gl_renderer.cpp
@@
-236,15
+236,6
@@
namespace GL
}
void
}
void
- Renderer::draw_text(const DrawingRequest& request)
- {
- const TextRequest* textrequest = (TextRequest*) request.request_data;
-
- textrequest->font->draw(this, textrequest->text, request.pos,
- textrequest->alignment, request.drawing_effect, request.alpha);
- }
-
- void
Renderer::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
Renderer::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
diff --git
a/src/video/lightmap.hpp
b/src/video/lightmap.hpp
index
bca28d4
..
049b21e
100644
(file)
--- a/
src/video/lightmap.hpp
+++ b/
src/video/lightmap.hpp
@@
-49,7
+49,6
@@
public:
virtual void do_draw() = 0;
virtual void draw_surface(const DrawingRequest& request) = 0;
virtual void draw_surface_part(const DrawingRequest& request) = 0;
virtual void do_draw() = 0;
virtual void draw_surface(const DrawingRequest& request) = 0;
virtual void draw_surface_part(const DrawingRequest& request) = 0;
- virtual void draw_text(const DrawingRequest& request) = 0;
virtual void draw_gradient(const DrawingRequest& request) = 0;
virtual void draw_filled_rect(const DrawingRequest& request) = 0;
virtual void get_light(const DrawingRequest& request) const = 0;
virtual void draw_gradient(const DrawingRequest& request) = 0;
virtual void draw_filled_rect(const DrawingRequest& request) = 0;
virtual void get_light(const DrawingRequest& request) const = 0;
diff --git
a/src/video/renderer.hpp
b/src/video/renderer.hpp
index
c1f10bf
..
2bd96d7
100644
(file)
--- a/
src/video/renderer.hpp
+++ b/
src/video/renderer.hpp
@@
-46,7
+46,6
@@
public:
virtual void draw_surface(const DrawingRequest& request) = 0;
virtual void draw_surface_part(const DrawingRequest& request) = 0;
virtual void draw_surface(const DrawingRequest& request) = 0;
virtual void draw_surface_part(const DrawingRequest& request) = 0;
- virtual void draw_text(const DrawingRequest& request) = 0;
virtual void draw_gradient(const DrawingRequest& request) = 0;
virtual void draw_filled_rect(const DrawingRequest& request)= 0;
virtual void do_take_screenshot() = 0;
virtual void draw_gradient(const DrawingRequest& request) = 0;
virtual void draw_filled_rect(const DrawingRequest& request)= 0;
virtual void do_take_screenshot() = 0;
diff --git
a/src/video/sdl_lightmap.cpp
b/src/video/sdl_lightmap.cpp
index
d8bdcde
..
8e7c70f
100644
(file)
--- a/
src/video/sdl_lightmap.cpp
+++ b/
src/video/sdl_lightmap.cpp
@@
-562,15
+562,6
@@
namespace SDL
}
void
}
void
- Lightmap::draw_text(const DrawingRequest& /*request*/)
- {
- //const TextRequest* textrequest = (TextRequest*) request.request_data;
-
- //textrequest->font->draw(textrequest->text, request.pos,
- // textrequest->alignment, request.drawing_effect, request.alpha);
- }
-
- void
Lightmap::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
Lightmap::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
diff --git
a/src/video/sdl_renderer.cpp
b/src/video/sdl_renderer.cpp
index
fecf7ea
..
dede6c8
100644
(file)
--- a/
src/video/sdl_renderer.cpp
+++ b/
src/video/sdl_renderer.cpp
@@
-369,15
+369,6
@@
namespace SDL
}
void
}
void
- Renderer::draw_text(const DrawingRequest& request)
- {
- const TextRequest* textrequest = (TextRequest*) request.request_data;
-
- textrequest->font->draw(this, textrequest->text, request.pos,
- textrequest->alignment, request.drawing_effect, request.alpha);
- }
-
- void
Renderer::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest
Renderer::draw_filled_rect(const DrawingRequest& request)
{
const FillRectRequest* fillrectrequest