diff options
| author | reduz <reduzio@gmail.com> | 2014-07-03 09:06:06 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-07-03 09:06:06 -0300 |
| commit | cd80d442a212a119b4bfce95dce78a08cbc49490 (patch) | |
| tree | 987f36c25511bab642917c7d537504a9c861130d | |
| parent | a5af2971bb3192305c38d45774e3d99ea6b095f0 (diff) | |
| parent | e253d2010d6f880ae6c8800c8b4789ab3c5ce651 (diff) | |
Merge pull request #569 from marynate/PR-3d-disabled-build
Fixed #553: Disable 3D nodes for smaller executable
| -rw-r--r-- | scene/main/viewport.cpp | 3 | ||||
| -rw-r--r-- | scene/resources/world.cpp | 18 |
2 files changed, 16 insertions, 5 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 91769bbb82..defa7da6ae 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -276,7 +276,7 @@ void Viewport::_notification(int p_what) { } break; case NOTIFICATION_READY: { - +#ifndef _3D_DISABLED if (cameras.size() && !camera) { //there are cameras but no current camera, pick first in tree and make it current Camera *first=NULL; @@ -290,6 +290,7 @@ void Viewport::_notification(int p_what) { if (first) first->make_current(); } +#endif } break; case NOTIFICATION_EXIT_SCENE: { diff --git a/scene/resources/world.cpp b/scene/resources/world.cpp index c684287461..880a3a32e3 100644 --- a/scene/resources/world.cpp +++ b/scene/resources/world.cpp @@ -225,17 +225,22 @@ struct SpatialIndexer { void World::_register_camera(Camera* p_camera) { +#ifndef _3D_DISABLED indexer->_add_camera(p_camera); +#endif } void World::_update_camera(Camera* p_camera){ +#ifndef _3D_DISABLED indexer->_update_camera(p_camera); - +#endif } void World::_remove_camera(Camera* p_camera){ +#ifndef _3D_DISABLED indexer->_remove_camera(p_camera); +#endif } @@ -243,26 +248,31 @@ void World::_remove_camera(Camera* p_camera){ void World::_register_notifier(VisibilityNotifier* p_notifier,const AABB& p_rect){ - +#ifndef _3D_DISABLED indexer->_notifier_add(p_notifier,p_rect); +#endif } void World::_update_notifier(VisibilityNotifier* p_notifier,const AABB& p_rect){ - +#ifndef _3D_DISABLED indexer->_notifier_update(p_notifier,p_rect); +#endif } void World::_remove_notifier(VisibilityNotifier* p_notifier){ - +#ifndef _3D_DISABLED indexer->_notifier_remove(p_notifier); +#endif } void World::_update(uint64_t p_frame) { +#ifndef _3D_DISABLED indexer->_update(p_frame); +#endif } |