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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Tim Moore
2010-05-05 09:40:31 +02:00
parent 4fffcf9975 3346bfc9a8
commit 13ecbb8bce
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/bvh/BVHDebugCollectVisitor.hxx
+6 -6
View File
@@ -148,9 +148,9 @@ private:
osg::Geometry* geometry = new osg::Geometry; osg::Geometry* geometry = new osg::Geometry;
osg::Vec3Array* vertices = new osg::Vec3Array; osg::Vec3Array* vertices = new osg::Vec3Array;
vertices->push_back(triangle.getVertex(0).osg()); vertices->push_back(toOsg(triangle.getVertex(0)));
vertices->push_back(triangle.getVertex(1).osg()); vertices->push_back(toOsg(triangle.getVertex(1)));
vertices->push_back(triangle.getVertex(2).osg()); vertices->push_back(toOsg(triangle.getVertex(2)));
osg::Vec4Array* colors = new osg::Vec4Array; osg::Vec4Array* colors = new osg::Vec4Array;
colors->push_back(color); colors->push_back(color);
@@ -172,7 +172,7 @@ private:
return; return;
SGSphered sphere = node.getBoundingSphere(); SGSphered sphere = node.getBoundingSphere();
osg::Sphere* shape = new osg::Sphere; osg::Sphere* shape = new osg::Sphere;
shape->setCenter(SGVec3f(sphere.getCenter()).osg()); shape->setCenter(toOsg(sphere.getCenter()));
shape->setRadius(sphere.getRadius()); shape->setRadius(sphere.getRadius());
addShape(shape, osg::Vec4(0.5f, 0.5f, 0.5f, 0.1f)); addShape(shape, osg::Vec4(0.5f, 0.5f, 0.5f, 0.1f));
} }
@@ -184,8 +184,8 @@ private:
BVHBoundingBoxVisitor bbv; BVHBoundingBoxVisitor bbv;
node.accept(bbv, data); node.accept(bbv, data);
osg::Box* shape = new osg::Box; osg::Box* shape = new osg::Box;
shape->setCenter(bbv.getBox().getCenter().osg()); shape->setCenter(toOsg(bbv.getBox().getCenter()));
shape->setHalfLengths((0.5*bbv.getBox().getSize()).osg()); shape->setHalfLengths(toOsg((0.5*bbv.getBox().getSize())));
addShape(shape, osg::Vec4(0.5f, 0, 0, 0.1f)); addShape(shape, osg::Vec4(0.5f, 0, 0, 0.1f));
} }