Changeset 241 for cpp/frams/vm

Timestamp:

05/07/14 20:39:52 (11 years ago)

Author:

Maciej Komosinski

Message:

Added toString() and angles representation to Orient

Location:

cpp/frams/vm/classes

Files:

• 3dobject.cpp (modified) (3 diffs)
• 3dobject.h (modified) (1 diff)

cpp/frams/vm/classes/3dobject.cpp

@@ -217 +217 @@
 static ParamEntry paramtab[]=
 {
-{"Orient",1,27,"Orient","3D orientation, stored as 3x3 matrix."},
+{"Orient",1,29,"Orient","3D orientation, stored as 3x3 matrix."},
 
 {"xx",1,PARAM_NOSTATIC,"orientation.x.x","f",FIELD(o.x.x),},
@@ -259 +259 @@
 {"localToWorld",0,PARAM_NOSTATIC,"transform coordinates","p oXYZ(oXYZ point,oXYZ center)",PROCEDURE(p_localToWorld),},
 {"worldToLocal",0,PARAM_NOSTATIC,"transform coordinates","p oXYZ(oXYZ point,oXYZ center)",PROCEDURE(p_worldToLocal),},
+{"angles",0,PARAM_READONLY | PARAM_NOSTATIC,"Euler angles representation","oXYZ",GETONLY(angles),},
+{"toString",0,PARAM_READONLY | PARAM_NOSTATIC,"textual form","s",GETONLY(toString),},
 {0,0,0,},
 };
@@ -433 +435 @@
 else
         ret->setEmpty();
+}
+
+void Orient_Ext::get_angles(ExtValue *ret)
+{
+*ret=Pt3D_Ext::makeDynamicObject(new Pt3D_Ext(o.getAngles()));
+}
+
+void Orient_Ext::get_toString(ExtValue *ret)
+{
+Pt3D a=o.getAngles();
+ret->setString(SString::sprintf("Orient@(%g,%g,%g)",a.x,a.y,a.z));
 }
 

cpp/frams/vm/classes/3dobject.h

@@ -71 +71 @@
 PARAMPROCDEF(p_localToWorld);
 PARAMPROCDEF(p_worldToLocal);
+PARAMGETDEF(angles);
 #undef STATRICKCLASS