projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- renamed LEFT_ALLIGN to ALIGN_LEFT
[supertux.git]
/
src
/
video
/
drawing_context.hpp
diff --git
a/src/video/drawing_context.hpp
b/src/video/drawing_context.hpp
index
fee4981
..
4839239
100644
(file)
--- a/
src/video/drawing_context.hpp
+++ b/
src/video/drawing_context.hpp
@@
-125,13
+125,16
@@
public:
/// return currently set alpha
float get_alpha() const;
/// return currently set alpha
float get_alpha() const;
+ /// on next update, set color to lightmap's color at position
+ void get_light(const Vector& position, Color* color );
+
enum Target {
NORMAL, LIGHTMAP
};
void push_target();
void pop_target();
void set_target(Target target);
enum Target {
NORMAL, LIGHTMAP
};
void push_target();
void pop_target();
void set_target(Target target);
-
+
void set_ambient_color( Color new_color );
private:
void set_ambient_color( Color new_color );
private:
@@
-162,7
+165,7
@@
private:
enum RequestType
{
enum RequestType
{
- SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT, LIGHTMAPREQUEST
+ SURFACE, SURFACE_PART, TEXT, GRADIENT, FILLRECT, LIGHTMAPREQUEST
, GETLIGHT
};
struct SurfacePartRequest
};
struct SurfacePartRequest
@@
-215,6
+218,11
@@
private:
}
};
}
};
+ struct GetLightRequest
+ {
+ Color* color_ptr;
+ };
+
typedef std::vector<DrawingRequest> DrawingRequests;
void handle_drawing_requests(DrawingRequests& requests);
typedef std::vector<DrawingRequest> DrawingRequests;
void handle_drawing_requests(DrawingRequests& requests);
@@
-224,6
+232,7
@@
private:
void draw_gradient(DrawingRequest& request);
void draw_filled_rect(DrawingRequest& request);
void draw_lightmap(DrawingRequest& request);
void draw_gradient(DrawingRequest& request);
void draw_filled_rect(DrawingRequest& request);
void draw_lightmap(DrawingRequest& request);
+ void get_light(DrawingRequest& request);
DrawingRequests drawing_requests;
DrawingRequests lightmap_requests;
DrawingRequests drawing_requests;
DrawingRequests lightmap_requests;