Changeset 115

Timestamp:

11/15/07 07:24:08 (1 year ago)

Author:

baxissimo

Message:

Cutting more debug printfs, and fixed crash bug on ply files that used "non-canonical" type names, like "float" instead of "float32".

Files:

• trunk/OpenMeshD/OpenMesh/Core/IO/importer/ImporterT.d (modified) (3 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/reader/PLYReader.d (modified) (4 diffs)

trunk/OpenMeshD/OpenMesh/Core/IO/importer/ImporterT.d

@@ -226 +226 @@
-        mesh_.get_property_handle(ph, _propname);
-        if (!ph.is_valid) {
-            //writefln("ADD PROPERTY: %s", _propname);
-            mesh_.add_property(ph, _propname);
-        }
-        writefln("%s[%4s] = (%s)%s", _propname,_vh.idx,typeid(T),_value);
-        *mesh_.property_ptr(ph, _vh) = _value;
-    }
-    void set_fpropertyT(T)(FaceHandle _fh, string _propname,  T _value) {
-        //writefln("setting fproperty: %s, type=%s  value=%s",_propname,typeid(T),_value);
-        FPropHandleT!(T) ph;
-        mesh_.get_property_handle(ph, _propname);
@@ -250 +247 @@
-        TypeInfo ti = _arguments[0];
-        void *aptr = _argptr;
-        //writefln("ti type:%s  args.lengt: %s", _arguments[0], _arguments.length);
-        if (_arguments.length == 2) {
-            if (ti == typeid(TypeInfo)) {
-                //writefln("ti was: ", ti);
-                ti = va_arg!(TypeInfo)(_argptr);
-                aptr = va_arg!(void*)(_argptr);
-                //writefln("ti now: ", ti);
-            }
-            else {
@@ -278 +272 @@
-        TypeInfo ti = _arguments[0];
-        void *aptr = _argptr;
-        //writefln("set_property(fh..) type:%s  args.lengt: %s", _arguments[0], _arguments.length);
-        if (_arguments.length == 2) {
-            if (ti == typeid(TypeInfo)) {
-                //writefln(  "  ti was: ", ti);
-                ti = va_arg!(TypeInfo)(_argptr);
-                aptr = va_arg!(void*)(_argptr);
-                //writefln(  "  ti now: ", ti);
-            }
-            else {

trunk/OpenMeshD/OpenMesh/Core/IO/reader/PLYReader.d

@@ -550 +550 @@
-            // words is like ["float32", "x"] -- "property" stripped
-            string propname = words[1];
+            string typename = ply_canonical_type(words[0]);
-            update_desc_from_prop(propname);
-words[0]
-words[0]
+typename
+typename
-            if (!(words[1] in known_props[cur_element])) {
-                if ((*prop_ptrs[cur_element])[$-1].type_supported) {
@@ -568 +569 @@
-            // merge the sequence into one VectorT prop
-            string prop_base_name = lines[0][2][0..$-first_suffix.length];
-lines[0][1]
+ply_canonical_type(lines[0][1])
-
-            TypeInfo ti;
@@ -594 +595 @@
-            // Something like: ["uint8", "int32", "vertex_indices"]
-            string propname = words[2];
+            string idxtypename = ply_canonical_type(words[0]);
+            string typename = ply_canonical_type(words[1]);
-            update_desc_from_prop(propname);
-words[1]
-words[0],words[1]
+typename
+idxtypename,typename
-            if (!(words[2] in known_props[cur_element])) {
-                derr.writefln(
@@ -656 +659 @@
-                    switch(len) {
-                    case 0: case 1: 
-
+
+
-
-                    case 2: case 3: case 4: