Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implemented Camera2D.Rotating property

Browse Source
This commit is contained in:
rafalcieslak 2014-02-10 13:55:12 +01:00
parent 56bf3d0a14
commit a29bfdf912
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/2d/camera_2d.cpp
View File

@ -131,9 +131,14 @@ Matrix32 Camera2D::get_camera_transform() {
} }
Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());; Point2 screen_offset = (centered ? (screen_size * 0.5 * zoom) : Point2());;
screen_offset+=offset; screen_offset+=offset;
float angle = get_global_transform().get_rotation();
if(rotating){
screen_offset = screen_offset.rotated(angle);
}
Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size); Rect2 screen_rect(-screen_offset+ret_camera_pos,screen_size);
if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT]) if (screen_rect.pos.x + screen_rect.size.x > limit[MARGIN_RIGHT])
screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x; screen_rect.pos.x = limit[MARGIN_RIGHT] - screen_rect.size.x;
@ -151,6 +156,9 @@ Matrix32 Camera2D::get_camera_transform() {
camera_screen_center=screen_rect.pos+screen_rect.size*0.5; camera_screen_center=screen_rect.pos+screen_rect.size*0.5;
Matrix32 xform; Matrix32 xform;
if(rotating){
xform.set_rotation(angle);
}
xform.scale_basis(zoom); xform.scale_basis(zoom);
xform.set_origin(screen_rect.pos/*.floor()*/); xform.set_origin(screen_rect.pos/*.floor()*/);
@ -251,6 +259,17 @@ bool Camera2D::is_centered() const {
return centered; return centered;
} }
void Camera2D::set_rotating(bool p_rotating){
rotating=p_rotating;
_update_scroll();
}
bool Camera2D::is_rotating() const {
return rotating;
}
void Camera2D::_make_current(Object *p_which) { void Camera2D::_make_current(Object *p_which) {
@ -394,6 +413,9 @@ void Camera2D::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_centered","centered"),&Camera2D::set_centered); ObjectTypeDB::bind_method(_MD("set_centered","centered"),&Camera2D::set_centered);
ObjectTypeDB::bind_method(_MD("is_centered"),&Camera2D::is_centered); ObjectTypeDB::bind_method(_MD("is_centered"),&Camera2D::is_centered);
ObjectTypeDB::bind_method(_MD("set_rotating","rotating"),&Camera2D::set_rotating);
ObjectTypeDB::bind_method(_MD("is_rotating"),&Camera2D::is_rotating);
ObjectTypeDB::bind_method(_MD("make_current"),&Camera2D::make_current); ObjectTypeDB::bind_method(_MD("make_current"),&Camera2D::make_current);
ObjectTypeDB::bind_method(_MD("_make_current"),&Camera2D::_make_current); ObjectTypeDB::bind_method(_MD("_make_current"),&Camera2D::_make_current);
@ -436,6 +458,7 @@ void Camera2D::_bind_methods() {
ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),_SCS("set_offset"),_SCS("get_offset")); ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"offset"),_SCS("set_offset"),_SCS("get_offset"));
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"centered"),_SCS("set_centered"),_SCS("is_centered")); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"centered"),_SCS("set_centered"),_SCS("is_centered"));
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"rotating"),_SCS("set_rotating"),_SCS("is_rotating"));
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"current"),_SCS("_set_current"),_SCS("is_current")); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"current"),_SCS("_set_current"),_SCS("is_current"));
ADD_PROPERTY( PropertyInfo(Variant::REAL,"smoothing"),_SCS("set_follow_smoothing"),_SCS("get_follow_smoothing") ); ADD_PROPERTY( PropertyInfo(Variant::REAL,"smoothing"),_SCS("set_follow_smoothing"),_SCS("get_follow_smoothing") );
ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"zoom"),_SCS("set_zoom"),_SCS("get_zoom") ); ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"zoom"),_SCS("set_zoom"),_SCS("get_zoom") );
@ -462,6 +485,7 @@ Camera2D::Camera2D() {
centered=true; centered=true;
rotating=false;
current=false; current=false;
limit[MARGIN_LEFT]=-10000000; limit[MARGIN_LEFT]=-10000000;
limit[MARGIN_TOP]=-10000000; limit[MARGIN_TOP]=-10000000;

4
scene/2d/camera_2d.h
View File

@ -50,6 +50,7 @@ protected:
Vector2 offset; Vector2 offset;
Vector2 zoom; Vector2 zoom;
bool centered; bool centered;
bool rotating;
bool current; bool current;
float smoothing; float smoothing;
int limit[4]; int limit[4];
@ -79,6 +80,9 @@ public:
void set_centered(bool p_centered); void set_centered(bool p_centered);
bool is_centered() const; bool is_centered() const;
void set_rotating(bool p_rotating);
bool is_rotating() const;
void set_limit(Margin p_margin,int p_limit); void set_limit(Margin p_margin,int p_limit);
int get_limit(Margin p_margin) const; int get_limit(Margin p_margin) const;