Changeset 237 for trunk/src

Timestamp:

05/14/14 19:08:41 (11 years ago)

Author:

epyon

Message:

• debug_draw module added
• evil vertex descriptor and info added
• fix for sampler objects
• various fixes

Location:

trunk/src

Files:

• gfx/debug_draw.cc (added)
• gfx/skeletal_mesh.cc (modified) (1 diff)
• gl/gl_enum.cc (modified) (1 diff)
• gl/gl_program.cc (modified) (1 diff)

trunk/src/gfx/skeletal_mesh.cc

@@ -58 +58 @@
         // Technically this is not needed, because the va is just a fake class, 
         // but if it's real it will be needed?
-        m_va->update_vertex_buffer( nv::slot::POSITION, m_vb_position, false );
-        m_va->update_vertex_buffer( nv::slot::NORMAL,   m_vb_normal,   false );
-        m_va->update_vertex_buffer( nv::slot::TANGENT,  m_vb_tangent,  false );
+//      m_va->update_vertex_buffer( nv::slot::POSITION, m_vb_position, false );
+//      m_va->update_vertex_buffer( nv::slot::NORMAL,   m_vb_normal,   false );
+//      m_va->update_vertex_buffer( nv::slot::TANGENT,  m_vb_tangent,  false );
+        // TODO: answer is - probably not
 }
 

trunk/src/gl/gl_enum.cc

@@ -246 +246 @@
         case GL_INT_VEC3       : return INT_VECTOR_3;
         case GL_INT_VEC4       : return INT_VECTOR_4;
+// TODO: separate types?
+        case GL_SAMPLER_1D         : return INT;
+        case GL_SAMPLER_2D         : return INT;
+        case GL_SAMPLER_3D         : return INT;
+        case GL_SAMPLER_CUBE       : return INT;
+        case GL_SAMPLER_1D_SHADOW  : return INT;        
+        case GL_SAMPLER_2D_SHADOW  : return INT;
+// TODO: implement?
+//      case GL_BOOL    
+//      case GL_BOOL_VEC2
+//      case GL_BOOL_VEC3
+//      case GL_BOOL_VEC4
+//      case GL_FLOAT_MAT2x3    
+//      case GL_FLOAT_MAT2x4    
+//      case GL_FLOAT_MAT3x2    
+//      case GL_FLOAT_MAT3x4    
+//      case GL_FLOAT_MAT4x2    
+//      case GL_FLOAT_MAT4x3    
         default : return datatype(0); // TODO: throw!
         }

trunk/src/gl/gl_program.cc

@@ -197 +197 @@
                 }
 
-                m_uniform_map[ name ] = create_uniform( utype, name, uni_loc, uni_len );
+                uniform_base* u = create_uniform( utype, name, uni_loc, uni_len );
+                NV_ASSERT( u, "Unknown uniform type!" );
+                m_uniform_map[ name ] = u;
         }