Changeset 104 for cpp/gdk/modelparts.cpp

Timestamp:

07/23/13 18:15:30 (12 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/modelparts.cpp (modified) (8 diffs)

cpp/gdk/modelparts.cpp

@@ -97 +97 @@
                        int _prefinputs,int _prefoutput,int _preflocation,
                        int *_vectordata,bool own_vd,int vhints)
-        :longname(_props->id),
-         name(_props->name),
-         description(_description),
+        :ownedvectordata(own_vd),
+         name(_props->name),longname(_props->id),description(_description),
          props(_props),
          prefinputs(_prefinputs),
          prefoutput(_prefoutput),
          preflocation(_preflocation),
-         vectordata(_vectordata),ownedvectordata(own_vd),
-         visualhints(vhints),impl(0),active(1),genactive(0)
+         vectordata(_vectordata),
+         visualhints(vhints),impl_count(0),/*impl(0),*/active(1),genactive(0)
 {}
 
@@ -114 +113 @@
 
 NeuroClass::NeuroClass()
-        :name("Invalid"),props(empty_paramtab),
+        :ownedvectordata(0),
+         name("Invalid"),
+         props(empty_paramtab),
          prefinputs(0), prefoutput(0),
-         preflocation(0), vectordata(0), ownedvectordata(0),
-         impl(0), active(1), genactive(0)
+         preflocation(0), vectordata(0), 
+         visualhints(0),impl_count(0), /*impl(0),*/ active(1), genactive(0)
 {}
 
@@ -176 +177 @@
 
 Neuro::Neuro(double _state,double _inertia,double _force,double _sigmo)
-        :state(_state),PartBase(getDefaultStyle())
+        :PartBase(getDefaultStyle()),state(_state)
 #ifdef MODEL_V1_COMPATIBLE
 ,inertia(_inertia),force(_force),sigmo(_sigmo)
@@ -187 +188 @@
 myclass=0;
 knownclass=1;
+part_refno=-1; joint_refno=-1;
 }
 
@@ -204 +206 @@
 #endif
 flags=0;
+part_refno=-1; joint_refno=-1;
 }
 
@@ -614 +617 @@
 ///////////////////////////////////////
 
-const SString& Part::getDefaultStyle()
-{static SString s("part"); return s;}
-const SString& Joint::getDefaultStyle()
-{static SString s("joint"); return s;}
+SString Part::getDefaultStyle()
+{return SString("part");}
+SString Joint::getDefaultStyle()
+{return SString("joint");}
 /*
 const SString& Neuro::getDefaultStyle()
@@ -624 +627 @@
 {static SString s("neuroitem"); return s;}
 */
-const SString& Neuro::getDefaultStyle()
-{static SString s("neuro"); return s;}
+SString Neuro::getDefaultStyle()
+{return SString("neuro");}
 
 Part::Part():PartBase(getDefaultStyle())
@@ -776 +779 @@
 };
 
-static Param staticparam;
-
-ParamInterface &Part::extraProperties()
-{
-staticparam.setParamTab(f0_part_xtra_paramtab);
-staticparam.select(this);
-return staticparam;
-}
-
-ParamInterface &Joint::extraProperties()
-{
-staticparam.setParamTab(f0_joint_xtra_paramtab);
-staticparam.select(this);
-return staticparam;
-}
-
-ParamInterface &Neuro::extraProperties()
-{
-staticparam.setParamTab(f0_neuro_xtra_paramtab);
-staticparam.select(this);
-return staticparam;
-}
-
-ParamInterface &Part::properties()
-{
-staticparam.setParamTab(f0_part_paramtab);
-staticparam.select(this);
-return staticparam;
-}
-
-ParamInterface &Joint::properties()
-{
-staticparam.setParamTab(usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
-staticparam.select(this);
-return staticparam;
-}
-
-ParamInterface &Neuro::properties()
-{
-staticparam.setParamTab(f0_neuro_paramtab);
-staticparam.select(this);
-return staticparam;
+Param Part::extraProperties()
+{
+return Param(f0_part_xtra_paramtab,this);
+}
+
+Param Joint::extraProperties()
+{
+return Param(f0_joint_xtra_paramtab,this);
+}
+
+Param Neuro::extraProperties()
+{
+return Param(f0_neuro_xtra_paramtab,this);
+}
+
+Param Part::properties()
+{
+return Param(f0_part_paramtab,this);
+}
+
+Param Joint::properties()
+{
+return Param(usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab,this);
+}
+
+Param Neuro::properties()
+{
+return Param(f0_neuro_paramtab,this);
 }