Merge pull request #569 from marynate/PR-3d-disabled-build

Fixed #553: Disable 3D nodes for smaller executable
godotengine · Jul 3, 2014 · cd80d44 · cd80d44
2 parents a5af297 + e253d20
commit cd80d44
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git 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
@@ -225,44 +225,54 @@ 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
 }
 
 
 
 
 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
 }