Ignore:
Timestamp:
04/04/15 20:40:02 (10 years ago)
Author:
Maciej Komosinski
Message:

Code formatting

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r286 r343  
    99#include <frams/util/extvalue.h>
    1010
    11 class Pt3D_Ext: public DestrBase
     11class Pt3D_Ext : public DestrBase
    1212{
    13   public:
    14 Pt3D p;
     13public:
     14        Pt3D p;
    1515
    16 Pt3D_Ext(double x,double y,double z):p(x,y,z) {}
    17 Pt3D_Ext():p(0,0,0) {}
    18 Pt3D_Ext(const Pt3D &i):p(i) {}
     16        Pt3D_Ext(double x, double y, double z) :p(x, y, z) {}
     17        Pt3D_Ext() :p(0, 0, 0) {}
     18        Pt3D_Ext(const Pt3D &i) :p(i) {}
    1919#define STATRICKCLASS Pt3D_Ext
    20 PARAMPROCDEF(p_new);
    21 PARAMPROCDEF(p_newFromVector);
    22 PARAMPROCDEF(p_clone);
    23 PARAMGETDEF(length);
    24 PARAMPROCDEF(p_addvec);
    25 PARAMPROCDEF(p_subvec);
    26 PARAMPROCDEF(p_scale);
    27 PARAMPROCDEF(p_rotate);
    28 PARAMPROCDEF(p_revrotate);
    29 PARAMPROCDEF(p_normalize);
    30 PARAMGETDEF(toString);
    31 PARAMGETDEF(toVector);
    32 PARAMPROCDEF(p_set);
    33 PARAMPROCDEF(p_set3);
    34 PARAMPROCDEF(p_get);
     20        PARAMPROCDEF(p_new);
     21        PARAMPROCDEF(p_newFromVector);
     22        PARAMPROCDEF(p_clone);
     23        PARAMGETDEF(length);
     24        PARAMPROCDEF(p_addvec);
     25        PARAMPROCDEF(p_subvec);
     26        PARAMPROCDEF(p_scale);
     27        PARAMPROCDEF(p_rotate);
     28        PARAMPROCDEF(p_revrotate);
     29        PARAMPROCDEF(p_normalize);
     30        PARAMGETDEF(toString);
     31        PARAMGETDEF(toVector);
     32        PARAMPROCDEF(p_set);
     33        PARAMPROCDEF(p_set3);
     34        PARAMPROCDEF(p_get);
    3535#undef STATRICKCLASS
    3636
    37 static ParamInterface* getInterface();
    38 static ExtObject makeStaticObject(Pt3D* p);
    39 static ExtObject makeDynamicObject(Pt3D_Ext* p);
    40 static ExtObject makeDynamicObject(const Pt3D& p);
    41 static Pt3D_Ext* fromObject(const ExtValue& v,bool warn=true);
    42 static Param& getStaticParam();
    43 static ParamEntry* getStaticParamtab();
     37        static ParamInterface* getInterface();
     38        static ExtObject makeStaticObject(Pt3D* p);
     39        static ExtObject makeDynamicObject(Pt3D_Ext* p);
     40        static ExtObject makeDynamicObject(const Pt3D& p);
     41        static Pt3D_Ext* fromObject(const ExtValue& v, bool warn = true);
     42        static Param& getStaticParam();
     43        static ParamEntry* getStaticParamtab();
    4444};
    4545
    46 class Orient_Ext: public DestrBase
     46class Orient_Ext : public DestrBase
    4747{
    48   public:
    49 Orient o;
     48public:
     49        Orient o;
    5050
    51 Orient_Ext():o(Orient_1) {}
    52 Orient_Ext(const Orient& other):o(other) {}
     51        Orient_Ext() :o(Orient_1) {}
     52        Orient_Ext(const Orient& other) :o(other) {}
    5353#define STATRICKCLASS Orient_Ext
    54 PARAMPROCDEF(p_new);
    55 PARAMPROCDEF(p_newFromVector);
    56 PARAMPROCDEF(p_clone);
    57 PARAMGETDEF(toString);
    58 PARAMGETDEF(toVector);
    59 PARAMGETDEF(x);
    60 PARAMGETDEF(y);
    61 PARAMGETDEF(z);
    62 PARAMPROCDEF(p_rotate3);
    63 PARAMPROCDEF(p_rotate);
    64 PARAMPROCDEF(p_revrotate);
    65 PARAMPROCDEF(p_lookat);
    66 PARAMPROCDEF(p_normalize);
    67 PARAMPROCDEF(p_between2);
    68 PARAMPROCDEF(p_betweenOV);
    69 PARAMPROCDEF(p_set);
    70 PARAMPROCDEF(p_reset);
    71 PARAMPROCDEF(p_localToWorld);
    72 PARAMPROCDEF(p_worldToLocal);
    73 PARAMGETDEF(angles);
     54        PARAMPROCDEF(p_new);
     55        PARAMPROCDEF(p_newFromVector);
     56        PARAMPROCDEF(p_clone);
     57        PARAMGETDEF(toString);
     58        PARAMGETDEF(toVector);
     59        PARAMGETDEF(x);
     60        PARAMGETDEF(y);
     61        PARAMGETDEF(z);
     62        PARAMPROCDEF(p_rotate3);
     63        PARAMPROCDEF(p_rotate);
     64        PARAMPROCDEF(p_revrotate);
     65        PARAMPROCDEF(p_lookat);
     66        PARAMPROCDEF(p_normalize);
     67        PARAMPROCDEF(p_between2);
     68        PARAMPROCDEF(p_betweenOV);
     69        PARAMPROCDEF(p_set);
     70        PARAMPROCDEF(p_reset);
     71        PARAMPROCDEF(p_localToWorld);
     72        PARAMPROCDEF(p_worldToLocal);
     73        PARAMGETDEF(angles);
    7474#undef STATRICKCLASS
    7575
    76 static ParamInterface* getInterface();
    77 static ExtObject makeStaticObject(Orient* p);
    78 static ExtObject makeDynamicObject(Orient_Ext* p);
    79 static Orient_Ext* fromObject(const ExtValue& v);
    80 static Param& getStaticParam();
    81 static ParamEntry* getStaticParamtab();
     76        static ParamInterface* getInterface();
     77        static ExtObject makeStaticObject(Orient* p);
     78        static ExtObject makeDynamicObject(Orient_Ext* p);
     79        static Orient_Ext* fromObject(const ExtValue& v);
     80        static Param& getStaticParam();
     81        static ParamEntry* getStaticParamtab();
    8282};
    8383
Note: See TracChangeset for help on using the changeset viewer.