Changeset 543

Timestamp:

03/06/08 19:29:25 (10 months ago)

Author:

phill

Message:

o Now with shader grouping magic!

Files:

• trunk/bin/win32/release (8.5)/bin/maya2q3.mll (modified) (previous)
• trunk/bin/win32/release (8.5)/bin/maya2q3.pdb (modified) (previous)
• trunk/maya2q3/bsp.cpp (modified) (14 diffs)
• trunk/maya2q3/maya_entry.cpp (modified) (1 diff)

trunk/maya2q3/bsp.cpp

@@ -29 +29 @@
-public:
-        BspImporter( void );
-
+, const MObject &parentTransform
-
-private:
-        float m_unitScale;
-        bool m_combineMeshes;
-
@@ -51 +50 @@
-
-        MObjectArray m_meshes;
+        MDagPathArray m_meshPaths;
-
-        std::vector< std::pair< int, int > > m_shaderMap;
@@ -56 +56 @@
-        MObjectArray m_shaders;
-
+        MSelectionList m_miscLmapSels;
+        std::vector< MSelectionList > m_lmapSels;
+        std::vector< MSelectionList > m_shaderSels;
+
-        q3::dheader_t m_fileHeader;
-        BinaryReader *m_fileData;
@@ -77 +81 @@
-                int firstVert = 0, int vertexCount = -1, int firstIndex = 0, int indexCount = -1 );
-
-MObject
+void
-        void ClearStagingArea();
-
@@ -83 +87 @@
-
-        void ImportSurfaces();
+        void CreateShaderQuickSelects();
+        void CreateQuickSelect( const MSelectionList &sel, const MString &name );
+
+        void GroupMeshNodes( const MObject &parentXform );
-};
-
-#pragma warning( disable : 4100 ) //shut up unreferenced parameter warnings until dev of this file is done
-
+template< size_t n >
+static void MangleShaderName( sstr< n > &ret, const char *src )
+{
+        for( char c = *src++; c; c = *src++ )
+        {
+                switch( c )
+                {
+                case '_':
+                        ret.Append( "__" );
+                        break;
+
+                case '.':
+                case '/':
+                case '\\':
+                        ret.Append( "_" );
+                        break;
+
+                default:
+                        ret.Append( "%c", c );
+                        break;
+                }
+        }
+}
+
-BspImporter::BspImporter( void )
-{
-        m_unitScale = 0.01F;
-        m_combineMeshes = false;
-}
@@ -104 +135 @@
-        }
-
+        if( shaderNum >= (int)m_shaderSels.size() )
+                m_shaderSels.resize( shaderNum + 1 );
+        if( lightmapNum >= 0 && lightmapNum >= (int)m_lmapSels.size() )
+                m_lmapSels.resize( lightmapNum + 1 );
+
-        const q3::dshader_t &shader = shaders[shaderNum];
-        sstr< 1024 > buf;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        if( lightmapNum >= 0 )
@@ -200 +217 @@
-                const q3::drawVert_t &v = verts[firstVert + i];
-
-* m_unitScale 
+
-                m_textureU.append( v.st.x );
-                m_textureV.append( v.st.y );
@@ -327 +344 @@
-                if( !m_combineMeshes && m_verts.length() )
-                {
-m_meshes.append( CreateMesh() 
+CreateMesh(
-                        ClearStagingArea();
-                }
@@ -333 +350 @@
-
-        if( m_verts.length() )
-m_meshes.append( CreateMesh() 
+CreateMesh(
-
-        ClearStagingArea();
@@ -340 +357 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-{
-        MStatus stat;
@@ -365 +367 @@
-
-        MString texCoordSetName( "map1" );
-        //stat = mesh.createUVSet( texCoordSetName );
-        //check_status( stat );
-        stat = mesh.setUVs( m_textureU, m_textureV, &texCoordSetName );
-        check_status( stat );
@@ -405 +405 @@
-                        continue;
-
+                MSelectionList *pLmapSel = &m_miscLmapSels;
+                MSelectionList *pShaderSel = &m_shaderSels[m_shaderMap[i].first];
+
+                if( m_shaderMap[i].second >= 0 )
+                        pLmapSel = &m_lmapSels[m_shaderMap[i].second];
+
-                MFnSet fnSg( m_shaders[i], &stat );
-                check_status( stat );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -458 +482 @@
-}
-
+void BspImporter::CreateShaderQuickSelects()
+{
+        std::vector< q3::dshader_t > shaders = ReadLump< q3::dshader_t >( q3::LUMP_SHADERS );
+
+        CreateQuickSelect( m_miscLmapSels, "lmap_none" );
+
+        for( uint i = 0; i < m_lmapSels.size(); i++ )
+        {
+                if( !m_lmapSels[i].length() )
+                        continue;
+
+                sstr< 64 > buf;
+                buf.Append( "lmap_%i", i );
+
+                CreateQuickSelect( m_lmapSels[i], MString( buf ) );
+        }
+
+        for( uint i = 0; i < m_shaderSels.size(); i++ )
+        {
+                if( !m_shaderSels[i].length() )
+                        continue;
+
+                sstr< 1024 > buf;
+                buf.Append( "shader_" );
+                MangleShaderName( buf, shaders[i].shader );
+
+                CreateQuickSelect( m_shaderSels[i], MString( buf ) );
+        }
+}
+
+void BspImporter::CreateQuickSelect( const MSelectionList &sel, const MString &name )
+{
+        MStatus stat;
+
+        MFnSet fnSet;
+        fnSet.create( sel, MFnSet::kNone, false, &stat );
+        check_status( stat );
+
+        fnSet.setName( name, &stat );
+        check_status( stat );
+}
+
+void BspImporter::GroupMeshNodes( const MObject &parentXform )
+{
+        /*
+        MStatus stat;
+
+        MFnDagNode fnParent( parentXform, &stat );
+        check_status( stat );
+
+        for( uint i = 0; i < m_meshPaths.length(); i++ )
+        {
+                MObject obj = m_meshPaths[i].node();
+                fnParent.addChild( obj );
+        }
+        */
+}
+
+void BspImporter::Import( std::istream &stm, const MObject &parentXform )
+{
+        size_t base_pos = stm.tellg();
+
+        BinaryReader in( stm );
+
+        in >> m_fileHeader;
+        for( int i = 0; i < q3::HEADER_LUMPS; i++ )
+                m_fileHeader.lumps[i].fileofs += base_pos;
+
+        m_fileData = &in;
+
+        ImportSurfaces();
+        CreateShaderQuickSelects();
+}
+
-class ImportBSP : public MPxFileTranslator
-{
@@ -490 +588 @@
-
-                std::ifstream file;
-f
+resolvedF
-
-                try
-                {
+                        MStatus stat;
+                        MFnTransform xform;
+                        MObject xformObj = xform.create( MObject::kNullObj, &stat );
+                        check_status( stat );
+
+                        filename.name();
+                        xform.setName( MString( "bsp_" ) + filename.resolvedName(), &stat );
+                        check_status( stat );
+
+                        const double scale[] = { 0.01, 0.01, 0.01 };
+                        stat = xform.setScale( scale );
+                        check_status( stat );
+
-                        BspImporter imp;
-
+, xformObj
-                }
-                catch( std::exception &ex )

trunk/maya2q3/maya_entry.cpp

@@ -26 +26 @@
-
-static const char *g_vendor = "HermitWorks";
-1
+2
-static const char *g_reqVer = "Any";
-