Changeset 4847 for OpenSceneGraph/trunk/examples/osgdelaunay/osgdelaunay.cpp

Timestamp:

11/27/05 16:32:57 (7 years ago)

Author:

robert

Message:

From Geoff Michel, fix for the scaling of the random number generation.

Files:

• OpenSceneGraph/trunk/examples/osgdelaunay/osgdelaunay.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgdelaunay/osgdelaunay.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
 *
 * This application is open source and may be redistributed and/or modified   
@@ -140 +140 @@
 
 class LinearConstraint: public osgUtil::DelaunayConstraint { 
-/** forces edges of a "Images/road" to fit triangles
+/** forces edges of a "road" to fit triangles
 *  if 2 roads cross, then the overlap will be replaced by a 'cross road'
     *  and the roads built up to the cross roads with a texture along its length. */
@@ -266 +266 @@
     int j=np%maxp;
     // make the random scale 0.00 if you want an equispaced XY grid.
-    float x=3000.0/(maxp-1)*i+0.00052*rand();
-    float y=3000.0/(maxp-1)*j+0.0005*rand();
+    float x=3000.0/(maxp-1)*i+16.*(float)rand()/RAND_MAX;
+    float y=3000.0/(maxp-1)*j+16.*(float)rand()/RAND_MAX;
     float z=getheight(x,y);
     if (np>=maxp*maxp) z=-1.e32;
@@ -381 +381 @@
     osg::ref_ptr<osgUtil::DelaunayConstraint> dc;
     std::ostringstream what;
-    if (1==1) { // add a simple constraint of few points
+    if (1==0) { // add a simple constraint of few points
         osg::ref_ptr<osgUtil::DelaunayConstraint> dc=new osgUtil::DelaunayConstraint;
         osg::Vec3Array *bounds=new osg::Vec3Array;
@@ -639 +639 @@
                 geode->addDrawable(dc2->makeAreal(arpts.get())); // this creates fill in geometry
                 
-                if (ndcs>4) { // a simple "Images/road"
+                if (ndcs>4) { // a simple "road"
                     trig->removeInternalTriangles(dc3.get());
                     dc3->setTexture ("Images/road.png");
@@ -1126 +1126 @@
 }
 
-osg::Vec3Array *LinearConstraint::getRoadNormals(const osg::Vec3Array*) const
+osg::Vec3Array *LinearConstraint::getRoadNormals(const osg::Vec3Array *points) const
 {
     osg::Vec3Array *nrms=new osg::Vec3Array;