Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 318 vs 322 for /trunk/Source Code/Environment/Vegetation/Vegetation.cpp

Diff revisions: vs.
  @@ -29,8 +29,6 @@
29 29 _success(false),
30 30 _culledFinal(false),
31 31 _shadowMapped(true),
32 - _threadedLoadComplete(false),
33 - _stopLoadingRequest(false),
34 32 _terrainSGN(nullptr),
35 33 _terrainChunk(nullptr),
36 34 _instanceCountGrass(0),
  @@ -39,6 +37,8 @@
39 37 _stateRefreshIntervalBuffer(0ULL),
40 38 _stateRefreshInterval(getSecToUs(1)) ///<Every second?
41 39 {
40 + _threadedLoadComplete = false;
41 + _stopLoadingRequest = false;
42 42 _readBuffer = 1;
43 43 _writeBuffer = 0;
44 44
  @@ -67,7 +67,7 @@
67 67 U32 timer = 0;
68 68 while(!_threadedLoadComplete){
69 69 // wait for the loading thread to finish first;
70 - boost::this_thread::sleep_for(boost::chrono::milliseconds(10));
70 + std::this_thread::sleep_for(std::chrono::milliseconds(10));
71 71 timer += 10;
72 72 if (timer > 1500) break;
73 73 }
  @@ -138,10 +138,10 @@
138 138 const U32 instanceDiv = 1;
139 139 };
140 140
141 - bool Vegetation::uploadGrassData(){
141 + void Vegetation::uploadGrassData(){
142 142 if (_grassPositions.empty()){
143 143 _threadedLoadComplete = true;
144 - return false;
144 + return;
145 145 }
146 146
147 147 static const vec2<F32> pos000(cosf(RADIANS(0.000f)), sinf(RADIANS(0.000f)));
  @@ -234,8 +234,6 @@
234 234 _grassScales.clear();
235 235
236 236 _render = _threadedLoadComplete = true;
237 -
238 - return true;
239 237 }
240 238
241 239 void Vegetation::sceneUpdate(const U64 deltaTime, SceneGraphNode* const sgn, SceneState& sceneState){