Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #4380 from bojidar-bg/camera2d-fix-zoom

Fix Camera2D ignoring zoom when checking limits
Rémi Verschelde 9 years ago
parent
1566da2a6f 7a8aea0be9
commit
6da39ce18d
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      scene/2d/camera_2d.cpp

+ 1 - 1
scene/2d/camera_2d.cpp
View File 

@@ -144,7 +144,7 @@ Matrix32 Camera2D::get_camera_transform()  {
 
 		screen_offset = screen_offset.rotated(angle);
 
 		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*zoom);
 
 	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;