[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flightgear-cvs
Subject:    [Flightgear-cvslogs] CVS: source/src/Model model_panel.cxx,1.5,1.6
From:       David Megginson <david () flightgear ! org>
Date:       2004-02-27 3:31:14
Message-ID: E1AwYiY-0002vO-00 () baron ! me ! umn ! edu
[Download RAW message or body]

Update of /var/cvs/FlightGear-0.9/source/src/Model
In directory baron:/tmp/cvs-serv11238/src/Model

Modified Files:
	model_panel.cxx 
Log Message:
Load submodels before animations, so that we can animate submodels.

Allow submodels to be named when they are loaded.


Index: model_panel.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Model/model_panel.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** a/model_panel.cxx	24 Sep 2003 17:20:56 -0000	1.5
--- b/model_panel.cxx	27 Feb 2004 03:31:12 -0000	1.6
***************
*** 103,116 ****
    }
  
-                                 // Load animations
-   vector<SGPropertyNode_ptr> animation_nodes = props.getChildren("animation");
-   for (i = 0; i < animation_nodes.size(); i++) {
-     const char * name = animation_nodes[i]->getStringValue("name", 0);
-     vector<SGPropertyNode_ptr> name_nodes =
-       animation_nodes[i]->getChildren("object-name");
-     sgMakeAnimation( model, name, name_nodes, prop_root, animation_nodes[i],
-                      sim_time_sec);
-   }
- 
                                  // Load sub-models
    vector<SGPropertyNode_ptr> model_nodes = props.getChildren("model");
--- 103,106 ----
***************
*** 131,137 ****
--- 121,138 ----
                                       prop_root, sim_time_sec );
      align->addKid(kid);
+     align->setName(node->getStringValue("name", ""));
      model->addKid(align);
    }
  
+                                 // Load animations
+   vector<SGPropertyNode_ptr> animation_nodes = props.getChildren("animation");
+   for (i = 0; i < animation_nodes.size(); i++) {
+     const char * name = animation_nodes[i]->getStringValue("name", 0);
+     vector<SGPropertyNode_ptr> name_nodes =
+       animation_nodes[i]->getChildren("object-name");
+     sgMakeAnimation( model, name, name_nodes, prop_root, animation_nodes[i],
+                      sim_time_sec);
+   }
+ 
    return alignmainmodel;
  }


_______________________________________________
Flightgear-cvslogs mailing list
Flightgear-cvslogs@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-cvslogs
[prev in list] [next in list] [prev in thread] [next in thread]