Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 18:47:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reorder PhysicsWorld and EntityTree in Application

Browse source
This commit is contained in:
Andrew Meadows 2014-11-14 09:03:41 -08:00
parent 7fb7256a92
commit 1a094f2b51
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -152,14 +152,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_voxelImporter(),
_importSucceded(false),
_sharedVoxelSystem(TREE_SCALE, DEFAULT_MAX_VOXELS_PER_SYSTEM, &_clipboard),
#ifdef USE_BULLET_PHYSICS
_physicsWorld(glm::vec3(0.0f)),
#endif // USE_BULLET_PHYSICS
_entities(true),
_entityCollisionSystem(),
_entityClipboardRenderer(false),
_entityClipboard(),
_wantToKillLocalVoxels(false),
#ifdef USE_BULLET_PHYSICS
_physicsWorld(glm::vec3(0.0f)),
#endif // USE_BULLET_PHYSICS
_viewFrustum(),
_lastQueriedViewFrustum(),
_lastQueriedTime(usecTimestampNow()),

8
interface/src/Application.h
View file

@ -494,6 +494,10 @@ private:
VoxelSystem _sharedVoxelSystem;
ViewFrustum _sharedVoxelSystemViewFrustum;
#ifdef USE_BULLET_PHYSICS
ThreadSafePhysicsWorld _physicsWorld;
#endif // USE_BULLET_PHYSICS
EntityTreeRenderer _entities;
EntityCollisionSystem _entityCollisionSystem;
EntityTreeRenderer _entityClipboardRenderer;
@ -504,10 +508,6 @@ private:
MetavoxelSystem _metavoxels;
#ifdef USE_BULLET_PHYSICS
ThreadSafePhysicsWorld _physicsWorld;
#endif // USE_BULLET_PHYSICS
ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
ViewFrustum _lastQueriedViewFrustum; /// last view frustum used to query octree servers (voxels)
ViewFrustum _displayViewFrustum;