hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SceneMainLoop -> SceneTree

Browse source 
-=-=-=-=-=-=-=-=-=-=-=-=-=-

*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree

Other stuff:
-Shower of bullets demo
-Fixes all around
This commit is contained in:
Juan Linietsky 2014-11-05 21:20:42 -03:00
parent d14baf6e41
commit 0dbedd18fc
168 changed files with 1534 additions and 1310 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scene/2d/tile_map.cpp
View file

@ -33,7 +33,7 @@ void TileMap::_notification(int p_what) {
switch(p_what) {
case NOTIFICATION_ENTER_SCENE: {
case NOTIFICATION_ENTER_TREE: {
pending_update=true;
_update_dirty_quadrants();
@ -43,7 +43,7 @@ void TileMap::_notification(int p_what) {
} break;
case NOTIFICATION_EXIT_SCENE: {
case NOTIFICATION_EXIT_TREE: {
_update_quadrant_space(RID());
@ -68,7 +68,7 @@ void TileMap::_update_quadrant_space(const RID& p_space) {
void TileMap::_update_quadrant_transform() {
if (!is_inside_scene())
if (!is_inside_tree())
return;
Matrix32 global_transform = get_global_transform();
@ -164,7 +164,7 @@ void TileMap::_update_dirty_quadrants() {
if (!pending_update)
return;
if (!is_inside_scene())
if (!is_inside_tree())
return;
if (!tile_set.is_valid())
return;
@ -345,7 +345,7 @@ Map<TileMap::PosKey,TileMap::Quadrant>::Element *TileMap::_create_quadrant(const
Physics2DServer::get_singleton()->body_set_param(q.static_body,Physics2DServer::BODY_PARAM_FRICTION,friction);
Physics2DServer::get_singleton()->body_set_param(q.static_body,Physics2DServer::BODY_PARAM_BOUNCE,bounce);
if (is_inside_scene()) {
if (is_inside_tree()) {
xform = get_global_transform() * xform;
RID space = get_world_2d()->get_space();
Physics2DServer::get_singleton()->body_set_space(q.static_body,space);
@ -379,7 +379,7 @@ void TileMap::_make_quadrant_dirty(Map<PosKey,Quadrant>::Element *Q) {
if (pending_update)
return;
pending_update=true;
if (!is_inside_scene())
if (!is_inside_tree())
return;
call_deferred("_update_dirty_quadrants");
}