Changeset 247 for cpp/frams/model

Timestamp:

11/07/14 17:51:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

Location:

cpp/frams/model

Files:

• model.cpp (modified) (1 diff)
• modelparts.cpp (modified) (1 diff)
• modelparts.h (modified) (12 diffs)

cpp/frams/model/model.cpp

@@ -129 +129 @@
 Model::~Model()
 {
-delmodel_list.action((long)this);
+delmodel_list.action((intptr_t)this);
 clear();
 }

cpp/frams/model/modelparts.cpp

@@ -163 +163 @@
                         {
                         case 'd': t+=" integer";
-                        {long a,b,c; if (p.getMinMax(i,a,b,c)>=2) t+=SString::sprintf(" %d..%d",a,b);}
+                        {paInt a,b,c; if (p.getMinMax(i,a,b,c)>=2) t+=SString::sprintf(" %d..%d",a,b);}
                                 break;
                         case 'f': t+=" float";

cpp/frams/model/modelparts.h

@@ -38 +38 @@
 MultiRange *mapped;
 enum PartBaseFlags { Selected=1 };
-long flags;
+int flags;
 Model *owner;   ///< backlink to the model
 
@@ -80 +80 @@
 Param extraProperties();
 Param properties();
-long refno;
+paInt refno;
 Pt3D rot;///< rotation angles
 
 ///
-long shape;///default=old framsticks compatible, do not mix with shapes>0
+paInt shape;///default=old framsticks compatible, do not mix with shapes>0
 enum Shape {SHAPE_DEFAULT=0, SHAPE_ELLIPSOID=1, SHAPE_CUBOID=2, SHAPE_CYLINDER=3};
 double mass,size,density,friction,ingest,assim;
@@ -119 +119 @@
 public:
 // base properties:
-long p1_refno,p2_refno; ///< parts' reference numbers
+paInt p1_refno,p2_refno; ///< parts' reference numbers
 
 Part *part1,*part2;     ///< references to parts
@@ -125 +125 @@
 class Pt3D rot; ///< orientation delta between parts expressed as 3 angles
 enum Shape {SHAPE_DEFAULT=0, SHAPE_SOLID=1};
-long shape;///< default=old framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with shape>0,  solid=merge parts into one physical entity
+paInt shape;///< default=old framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with shape>0,  solid=merge parts into one physical entity
 
 Joint();
@@ -159 +159 @@
 
 // do not touch these:
-long refno; ///< this joint's reference number
+paInt refno; ///< this joint's reference number
 double stamina;
 double stif,rotstif;    ///< stiffness for moving and bending forces
@@ -189 +189 @@
 ParamEntry *props;
 bool ownedprops;//< destructor will free props using ParamObject::freeParamTab
-long prefinputs,prefoutput;
-long preflocation;
+paInt prefinputs,prefoutput;
+paInt preflocation;
 int *vectordata;
-long visualhints;
+paInt visualhints;
 
 //void *impl;
@@ -220 +220 @@
     extra inputs may be ignored by the object (depends on the class).
  */
-int getPreferredInputs() {return prefinputs;}
+int getPreferredInputs() {return (int)prefinputs;}
 
 /** @return 0 if this object doesn't provide useful output signal. */
-int getPreferredOutput() {return prefoutput;}
+int getPreferredOutput() {return (int)prefoutput;}
 
 /** @return 0 if the object doesn't need any assignment to the body element.
@@ -229 +229 @@
     @return 2 = the object prefers to have the Joint ( @see Neuro::attachToJoint() )
  */
-int getPreferredLocation() {return preflocation;}
+int getPreferredLocation() {return (int)preflocation;}
 /** vector drawing to be used in neuro net diagram.
     interpretation:
@@ -251 +251 @@
  */
 int getVisualHints()
- {return visualhints;}
+ {return (int)visualhints;}
 
 enum Hint
@@ -377 +377 @@
 SyntParam classProperties(bool handle_defaults_when_saving=true);
 // base properties:
-long refno; ///< unique reference number (former 'neuro' refno)
-
-long part_refno; ///< can be used by some items as the part ref#
-long joint_refno; ///< can be used by some items as the joint ref#
+paInt refno; ///< unique reference number (former 'neuro' refno)
+
+paInt part_refno; ///< can be used by some items as the part ref#
+paInt joint_refno; ///< can be used by some items as the joint ref#
 
 Pt3D pos,rot;   ///< default = zero
@@ -451 +451 @@
    or -1 if 'child' is not connected with this Neuro.*/
 int findInput(Neuro* child) const;
-void removeInput(int refno);
+void removeInput(paInt refno);
 /**    @return reference number of the child connection, like findInput() */
 int removeInput(Neuro* child);
@@ -470 +470 @@
 #ifdef MODEL_V1_COMPATIBLE
 friend class OldItems;
-long neuro_refno; ///< parent ref# (called neuro_refno for compatibility with old Neuro class), @see moredata
-long conn_refno; ///< the other neuron ref# in N-N connections, can be used by some other items
+paInt neuro_refno; ///< parent ref# (called neuro_refno for compatibility with old Neuro class), @see moredata
+paInt conn_refno; ///< the other neuron ref# in N-N connections, can be used by some other items
 double weight; ///< weight of the N-N connection and (all?) receptors
 double inertia,force,sigmo; //!!!