Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 1020 vs 1021 for /trunk/Source Code/Scenes/Headers/Scene.h

Diff revisions: vs.
  @@ -288,12 +288,12 @@
288 288 vectorImpl<std::shared_ptr<TerrainDescriptor>> _terrainInfoArray;
289 289 F32 _LRSpeedFactor;
290 290 /// Current selection
291 - hashMapImpl<U8 /*player index*/, SceneGraphNode*> _currentSelection;
292 - hashMapImpl<U8 /*player index*/, I64> _currentHoverTarget;
291 + hashMapImpl<PlayerIndex, SceneGraphNode*> _currentSelection;
292 + hashMapImpl<PlayerIndex, I64> _currentHoverTarget;
293 293
294 294 SceneGraphNode* _currentSky;
295 - hashMapImpl<U8, SceneGraphNode*> _flashLight;
296 -
295 + hashMapImpl<PlayerIndex, SceneGraphNode*> _flashLight;
296 + hashMapImpl<PlayerIndex, U32> _cameraUpdateMap;
297 297 /// Scene::load must be called by every scene. Add a load flag to make sure!
298 298 bool _loadComplete;
299 299 /// Schedule a scene graph parse with the physics engine to recreate/recheck
  @@ -307,6 +307,7 @@
307 307 SceneState* _sceneState;
308 308 vectorImpl<DELEGATE_CBK<void, U8 /*player index*/> > _selectionChangeCallbacks;
309 309 vectorImpl<I64> _sceneSelectionCandidates;
310 + std::unordered_set<PlayerIndex> _hoverUpdateQueue;
310 311
311 312 protected:
312 313 LightPool* _lightPool;