Changeset 205 for osgVisual/trunk/src

Timestamp:

Jan 24, 2011, 9:10:14 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/trunk/src/object/visual_object.cpp (modified) (2 diffs)

osgVisual/trunk/src/object/visual_object.cpp

@@ -43 +43 @@
         geometry_offset_rotation.makeRotate( 0.0, 1.0, 1.0, 1.0 );
 
-        // Init Scale
+        // Init Scale factor
         scaleX = 1.0;
         scaleY = 1.0;
@@ -74 +74 @@
         //osg::ref<visual_object> object = new visual_object( root, nodeName);
 
-        std::string filename="", type
-
-                        /*
-                        <models>
-                          <model filename="cessna" type="plain" label="TestText!" dynamic="yes">
-                                <position lat="47.12345" lon="11.234567" alt="1500.0"></position>
-                                <attitude rot_x="0.0" rot_y="0.0" rot_z="0.0"></attitude>
-                                <cameraoffset>
-                                  <translation trans_x="0.0" trans_y="0.0" trans_z="0.0"></translation>
-                                  <rotation rot_x="0.0" rot_y="0.0" rot_z="0.0"></rotation>
-                                </cameraoffset>
-                          </model>
-                        </models>
-                        */
+        std::string objectname="", filename="", label="";
+        bool dynamic = false;
+        double lat=0.0, lon=0.0, alt=0.0, rot_x=0.0, rot_y=0.0, rot_z=0.0;
+        double cam_trans_x=0.0, cam_trans_y=0.0, cam_trans_z=0.0, cam_rot_x=0.0, cam_rot_y=0.0, cam_rot_z=0.0;
+        double geometry_rot_x=0.0, geometry_rot_y=0.0, geometry_rot_z=0.0;
+        double geometry_scale_x=1.0, geometry_scale_y=1.0, geometry_scale_z=1.0;
+        osg::ref_ptr<osgVisual::object_updater> updater = NULL;
+
+        osgVisual::visual_object* object = new osgVisual::visual_object( sceneRoot_, objectname );
+        object->lat = lat;
+        object->lon = lon;
+        object->alt = alt;
+        object->azimuthAngle_psi = rot_x;
+        object->pitchAngle_theta = rot_y;
+        object->bankAngle_phi = rot_z;
+        if(label!="")
+                object->addLabel("XML_defined_label", label);
+        if(dynamic)
+        {
+                updater = new osgVisual::object_updater(object);
+        }
+        object->setCameraOffset( cam_trans_x, cam_trans_y, cam_trans_z, cam_rot_x, cam_rot_y, cam_rot_z);
+        if(filename!="")
+        {
+                object->loadGeometry( filename );
+                object->setGeometryOffset( geometry_rot_x, geometry_rot_y, geometry_rot_z );
+                object->setScale( geometry_scale_x, geometry_scale_y, geometry_scale_z ); 
+        }
+
+        if(updater.valid())
+                object->addUpdater( updater );  
+
+        /*
+        - updater [optional]: Channels to use for position and attitude update
+
+        <updater>
+          <translation-slots>todo</translation-slots>
+        </updater>
+    */
 
         OSG_NOTIFY( osg::ALWAYS ) << "Done." << std::endl;
-        return NULL;
+        return object;
 }