Changeset 535

Timestamp:

03/05/08 15:32:26 (10 months ago)

Author:

phill

Message:

o Can now import patches.

Files:

• trunk/bin/win32/release (8.5)/bin (modified) (1 prop)
• trunk/bin/win32/release (8.5)/bin/maya2q3.mll (added)
• trunk/bin/win32/release (8.5)/bin/maya2q3.pdb (added)
• trunk/bin/win32/release (8.5)/maya2q3.mll (deleted)
• trunk/bin/win32/release (8.5)/maya2q3.pdb (deleted)
• trunk/common/math-vector.h (modified) (2 diffs)
• trunk/maya2q3/bsp-patches.cpp (added)
• trunk/maya2q3/bsp.cpp (modified) (5 diffs)
• trunk/maya2q3/maya2q3.vcproj (modified) (8 diffs)
• trunk/maya2q3/q3util.h (modified) (1 diff)

trunk/common/math-vector.h

@@ -84 +84 @@
-inline vec2 abs( const vec2 &v ) { return vec2c( abs( v.x ), abs( v.y ) ); }
-
+inline bool equal( const vec2 &v0, const vec2 &v1, float tol ) { return fabsf( v0.x - v1.x ) <= tol && fabsf( v0.y - v1.y ) <= tol; }
+
-struct vec3
-{
@@ -138 +140 @@
-inline vec3 abs( const vec3 &v ) { return vec3c( abs( v.x ), abs( v.y ), abs( v.z ) ); }
-
+inline bool equal( const vec3 &v0, const vec3 &v1, float tol ) { return fabsf( v0.x - v1.x ) <= tol && fabsf( v0.y - v1.y ) <= tol && fabsf( v0.z - v1.z ) <= tol; }
+
-__declspec( align( 16 ) ) struct vec4
-{

trunk/maya2q3/bsp.cpp

@@ -34 +34 @@
-        MIntArray m_faceVertIndices;
-
+        std::vector< q3::Patch > m_patchStaging;
+
-        BspMeshData( void );
-
@@ -41 +43 @@
-
-private:
+        void AppendTriangles( const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices,
+                int firstVert = 0, int vertexCount = -1, int firstIndex = 0, int indexCount = -1 );
-        void AppendFace( const q3::dsurface_t &surf, const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices );
-        void AppendMesh( const q3::dsurface_t &surf, const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices );
+        void AppendPatch( const q3::dsurface_t &surf, const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices );
+
+        void BakePatches();
-};
-
@@ -52 +59 @@
-}
-
+void BspMeshData::AppendTriangles( const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices,
+                int firstVert, int vertexCount, int firstIndex, int indexCount )
+{
+        if( vertexCount == -1 )
+                vertexCount = (int)verts.size();
+        if( indexCount == -1 )
+                indexCount = (int)indices.size();
+
+        int baseVert = (int)m_verts.length();
+        for( int i = 0; i < vertexCount; i++ )
+                m_verts.append( MPoint( verts[firstVert + i].xyz ) );
+
+        //ToDo: collapse out coplanar edges     (?)
+
+        int numTris = indexCount / 3;
+        for( int i = 0; i < numTris; i++ )
+        {
+                m_faceVertIndices.append( baseVert + indices[firstIndex + i * 3 + 0] );
+                m_faceVertIndices.append( baseVert + indices[firstIndex + i * 3 + 2] );
+                m_faceVertIndices.append( baseVert + indices[firstIndex + i * 3 + 1] );
+
+                m_faceCounts.append( 3 );
+        }
+}
+
-void BspMeshData::AppendFace( const q3::dsurface_t &surf, const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-void BspMeshData::AppendMesh( const q3::dsurface_t &surf, const std::vector< q3::drawVert_t > &verts, const std::vector< int > &indices )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -135 +164 @@
-                        break;
-
+                case q3::MST_PATCH:
+                        AppendPatch( surfs[i], verts, indices );
+                        break;
+
-                default:
-                        warn( "Ignoring surface." );
@@ -143 +176 @@
-MObject BspMeshData::CreateMesh( void )
-{
+        BakePatches();
+
-        MStatus stat;
-

trunk/maya2q3/maya2q3.vcproj

@@ -18 +18 @@
-                <Configuration
-                        Name="Debug (6.0)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -109 +109 @@
-                <Configuration
-                        Name="Release (6.0)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -198 +198 @@
-                <Configuration
-                        Name="Debug (7.0)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -289 +289 @@
-                <Configuration
-                        Name="Release (7.0)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -378 +378 @@
-                <Configuration
-                        Name="Debug (8.5)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -470 +470 @@
-                <Configuration
-                        Name="Release (8.5)|Win32"
-
+\bin
-                        IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
@@ -554 +554 @@
-                                Name="VCPostBuildEventTool"
-                                Description="Copying to Maya plugins directory."
-
-
+
-                        />
-                </Configuration>
@@ -568 +567 @@
-                        >
-                        <File
+                                RelativePath=".\bsp-patches.cpp"
+                                >
+                        </File>
+                        <File
-                                RelativePath=".\bsp.cpp"
-                                >

trunk/maya2q3/q3util.h

@@ -91 +91 @@
-MString GetTagName( const MDagPath &path );
-
+struct Patch
+{
+        vec3                                    lodOrigin;
+        float                                   lodRadius;
+        int                                             lodFixed;
+        bool                                    lodStitched;
+
+        int                                             width;
+        int                                             height;
+        std::vector< float >    widthLodError;
+        std::vector< float >    heightLodError;
+        std::vector< q3::drawVert_t >   verts;
+
+        uint                                    meshIdx;
+};
+
+void StitchAllPatches( std::vector< Patch > &patches );
+void FixSharedVertexLodError( std::vector< Patch > &patches );
+Patch SubdividePatchToGrid( int width, int height, const drawVert_t points[] );
+
+void PatchToMesh( const Patch &patch, std::vector< q3::drawVert_t > &out_verts, std::vector< int > &out_indices );
+
-};
-