Changeset 235

Timestamp:

Feb 14, 2011, 6:36:08 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• src/core/visual_core.cpp (modified) (5 diffs)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -71 +71 @@
         </geometry>
       </model>
-      <trackmodel id="2" updater_slot="trackID"></trackmodel> 
+      <trackmodel id="2" updater_slot="TRACKING_ID"></trackmodel> 
     </models>
     <datetime day="0" month="0" year="0" hour="12" minute="30"></datetime>

osgVisual/trunk/src/core/visual_core.cpp

@@ -360 +360 @@
         //testObj->setGeometry( util::getDemoCylinder(5000.0, 20.0 ) );
         //testObj->addUpdater( new object_updater(testObj) );
+        //testObj->setTrackingId(2);
 
         //osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "neuschwanstein" );       // todo memleak
@@ -366 +367 @@
         //testObj2->loadGeometry( "../models/neuschwanstein.osgb" );
         ////testObj2->addUpdater( new object_updater(testObj2) );
+        //testObj2->setTrackingId(3);
 
         //osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" );     // todo memleak
@@ -371 +373 @@
         //testObj3->loadGeometry( "../models/saenger1.flt" );
         //testObj3->addUpdater( new object_updater(testObj3) );
-        //
+        //testObj3->setTrackingId(4);
 
         osg::ref_ptr<visual_object> testObj4 = new visual_object( rootNode, "SAENGER2" );       // todo memleak
@@ -378 +380 @@
         testObj4->addUpdater( new object_updater(testObj4) );
         testObj4->addLabel("testLabel", "Object4 :)",osg::Vec4(1.0f,0.25f,1.0f,1.0f));
+        testObj4->setTrackingId(5);
 
         //osg::ref_ptr<visual_object> testObj5 = new visual_object( rootNode, "SAENGER" );      // todo memleak
@@ -384 +387 @@
         ////testObj5->setScale( 2 );
         //testObj5->addUpdater( new object_updater(testObj5) );
-
-        //trackNode( testObj4 );
+        //testObj5->setTrackingId(6);
+
+        manipulators->trackNode( testObj4 );
 
         // Load EDDF