Changeset 825

Timestamp:

11/25/18 20:10:31 (6 years ago)

Author:

Maciej Komosinski

Message:

Simplified XYZ.toString() and made Orient.toString() use our official number-formatting function

Location:

cpp/frams/vm/classes

Files:

• 3dobject.cpp (modified) (8 diffs)
• 3dobject.h (modified) (2 diffs)

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

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -93 +93 @@
 }
 
+SString Pt3D_Ext::toString() const
+{
+        SString s = "(";
+        s += SString::valueOf(p.x);
+        s += ",";
+        s += SString::valueOf(p.y);
+        s += ",";
+        s += SString::valueOf(p.z);
+        s += ")";
+        return s;
+}
+
 void Pt3D_Ext::get_toString(ExtValue *ret)
 {
-        SString s = "(";
-        ExtValue v;
-        v.setDouble(p.x); s += v.getString();
-        s += ",";
-        v.setDouble(p.y); s += v.getString();
-        s += ",";
-        v.setDouble(p.z); s += v.getString();
-        s += ")";
-        ret->setString(s);
+        ret->setString(toString());
 }
 
@@ -174 +178 @@
 {
         int index = args->getInt();
-        if ((index < 0) || (index>2))
+        if ((index < 0) || (index > 2))
                 ret->setEmpty();
         else
@@ -184 +188 @@
 #ifdef __CODEGUARD__
         static Pt3D_Ext static_pt3dobj;
-        static Param static_pt3dparam(getStaticParamtab(),&static_pt3dobj);
+        static Param static_pt3dparam(getStaticParamtab(), &static_pt3dobj);
 #else
         static Param static_pt3dparam(getStaticParamtab());
@@ -378 +382 @@
         {
                 double q1 = args[0].getDouble(), q2 = 1.0 - q1;
-                o.x.x = q1*o1->o.x.x + q2*o2->o.x.x;
-                o.x.y = q1*o1->o.x.y + q2*o2->o.x.y;
-                o.x.z = q1*o1->o.x.z + q2*o2->o.x.z;
-                o.y.x = q1*o1->o.y.x + q2*o2->o.y.x;
-                o.y.y = q1*o1->o.y.y + q2*o2->o.y.y;
-                o.y.z = q1*o1->o.y.z + q2*o2->o.y.z;
-                o.z.x = q1*o1->o.z.x + q2*o2->o.z.x;
-                o.z.y = q1*o1->o.z.y + q2*o2->o.z.y;
-                o.z.z = q1*o1->o.z.z + q2*o2->o.z.z;
+                o.x.x = q1 * o1->o.x.x + q2 * o2->o.x.x;
+                o.x.y = q1 * o1->o.x.y + q2 * o2->o.x.y;
+                o.x.z = q1 * o1->o.x.z + q2 * o2->o.x.z;
+                o.y.x = q1 * o1->o.y.x + q2 * o2->o.y.x;
+                o.y.y = q1 * o1->o.y.y + q2 * o2->o.y.y;
+                o.y.z = q1 * o1->o.y.z + q2 * o2->o.y.z;
+                o.z.x = q1 * o1->o.z.x + q2 * o2->o.z.x;
+                o.z.y = q1 * o1->o.z.y + q2 * o2->o.z.y;
+                o.z.z = q1 * o1->o.z.z + q2 * o2->o.z.z;
                 o.normalize();
         }
@@ -399 +403 @@
         {
                 double q1 = args[0].getDouble(), q2 = 1.0 - q1;
-                o.x.x = q1*o1->o.x.x + q2*p2->p.x;
-                o.x.y = q1*o1->o.x.y + q2*p2->p.y;
-                o.x.z = q1*o1->o.x.z + q2*p2->p.z;
+                o.x.x = q1 * o1->o.x.x + q2 * p2->p.x;
+                o.x.y = q1 * o1->o.x.y + q2 * p2->p.y;
+                o.x.z = q1 * o1->o.x.z + q2 * p2->p.z;
                 o.normalize();
         }
@@ -448 +452 @@
 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));
+        Pt3D_Ext a(o.getAngles());
+        ret->setString(SString("Orient@") + a.toString());
 }
 
@@ -456 +460 @@
 #ifdef __CODEGUARD__
         static Orient_Ext static_orientobj;
-        static Param static_orientparam(getStaticParamtab(),&static_orientobj);
+        static Param static_orientparam(getStaticParamtab(), &static_orientobj);
 #else
         static Param static_orientparam(getStaticParamtab());

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

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -34 +34 @@
         PARAMPROCDEF(p_get);
 #undef STATRICKCLASS
-
+        SString toString() const;
         static ParamInterface* getInterface();
         static ExtObject makeStaticObject(Pt3D* p);