FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit number of random objects per triangle

Browse Source
This commit is contained in:
Stuart Buchanan
2014-11-07 22:22:55 +00:00
parent 5fef44b11c
commit 365ddb84a7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
simgear/scene/tgdb/SGTexturedTriangleBin.hxx
View File

@@ -22,6 +22,8 @@
#ifndef SG_TEXTURED_TRIANGLE_BIN_HXX
#define SG_TEXTURED_TRIANGLE_BIN_HXX
#define MAX_RANDOM_OBJECTS 100.0
#include <osg/Array>
#include <osg/Geometry>
#include <osg/PrimitiveSet>
@@ -291,8 +293,8 @@ public:
osg::Texture2D* object_mask,
std::vector<std::pair<SGVec3f, float> >& points)
{
unsigned num = getNumTriangles();
for (unsigned i = 0; i < num; ++i) {
unsigned numtriangles = getNumTriangles();
for (unsigned i = 0; i < numtriangles; ++i) {
triangle_ref triangleRef = getTriangleRef(i);
SGVec3f v0 = getVertex(triangleRef[0]).GetVertex();
SGVec3f v1 = getVertex(triangleRef[1]).GetVertex();
@@ -312,6 +314,13 @@ public:
// for this triangle.
double num = area / coverage + mt_rand(&seed);
if (num > MAX_RANDOM_OBJECTS) {
SG_LOG(SG_TERRAIN, SG_ALERT,
"Per-triangle random object count exceeded limits ("
<< MAX_RANDOM_OBJECTS << ") " << num);
num = MAX_RANDOM_OBJECTS;
}
// place an object each unit of area
while ( num > 1.0 ) {
float a = mt_rand(&seed);