Changeset 148 for trunk

Timestamp:

07/07/13 03:10:37 (12 years ago)

Author:

epyon

Message:

• md3 loader - work in progress

Location:

trunk

Files:

• nv/formats/md3_loader.hh (added)
• nv/interface/mesh.hh (modified) (1 diff)
• nv/interface/stream.hh (modified) (1 diff)
• src/formats/md3_loader.cc (added)
• src/formats/obj_loader.cc (modified) (2 diffs)

trunk/nv/interface/mesh.hh

@@ -80 +80 @@
                 { 
                         if ( m_indices ) delete m_indices; // error?
-                        m_indices = new vertex_attribute<T>(""); 
-                        return m_indices;
+                        vertex_attribute<T>* result = new vertex_attribute<T>(""); 
+                        m_indices = result; 
+                        return result;
                 }
 

trunk/nv/interface/stream.hh

@@ -17 +17 @@
 namespace nv
 {
+
         enum class origin : uint32 
         {
-                SET = 0x00,
-                CUR = 0x01,
-                END = 0x02,
+                SET = 0,
+                CUR = 1,
+                END = 2,
         };
 

trunk/src/formats/obj_loader.cc

@@ -194 +194 @@
                 uint32 i3 = a * 3 + 2;
 
+                // TODO: simplify
+
                 const vec3& v1 = vp[i1];
                 const vec3& v2 = vp[i2];
@@ -206 +208 @@
                 vec2 st1  = w2 - w1;
                 vec2 st2  = w3 - w1;
-
-                float x1 = v2.x - v1.x;
-                float y1 = v2.y - v1.y;
-                float z1 = v2.z - v1.z;
-
-                float x2 = v3.x - v1.x;
-                float y2 = v3.y - v1.y;
-                float z2 = v3.z - v1.z;
 
                 float s1 = w2.x - w1.x;