Changeset 547

Timestamp:

03/25/08 04:24:06 (10 months ago)

Author:

phill

Message:

o Texture import madness. Ish.

Files:

• trunk/maya2q3/bsp.cpp (modified) (11 diffs)
• trunk/maya2q3/maya_entry.cpp (modified) (1 diff)

trunk/maya2q3/bsp.cpp

@@ -43 +43 @@
-public:
-        BspImporter( void );
-
+, const char *basePath
-
-private:
@@ -79 +79 @@
-        std::vector< MSelectionList > m_shaderSels;
-
+        const char *m_basePath;
-        q3::dheader_t m_fileHeader;
-        BinaryReader *m_fileData;
@@ -103 +104 @@
-        void ClearStagingArea();
-
+        MObject ImportTexture( const char *shaderName );
-        int GetShaderIndex( const std::vector< q3::dshader_t > &shaders, int shaderNum, int lightmapNum );
-
@@ -147 +149 @@
-}
-
+MObject BspImporter::ImportTexture( const char *shaderName )
+{
+        ospath basePath( m_basePath );
+        basePath.Append( shaderName );
+
+        const char *path = 0;
+
+        static const char *const exts[] = { ".tga", ".jpg" };
+        for( size_t i = 0; i < lengthof( exts ); i++ )
+        {
+                ospath p2( basePath );
+                p2.Append( exts[i] );
+
+                if( GetFileAttributesA( p2 ) != INVALID_FILE_ATTRIBUTES )
+                {
+                        basePath = p2;
+                        path = basePath;
+                        break;
+                }
+        }
+
+        if( !path )
+                return MObject::kNullObj;
+
+        MStatus stat;
+
+        MFnDependencyNode fnTex;
+        fnTex.create( MString( "file" ), &stat );
+        check_status( stat );
+
+        sstr< 1024 > nameBuf;
+        MangleShaderName( nameBuf, shaderName );
+        nameBuf.Append( "_tex" );
+
+        fnTex.setName( MString( nameBuf ), &stat );
+        check_status( stat );
+
+        MPlug filePlug = fnTex.findPlug( MString( "fileTextureName" ), &stat );
+        check_status( stat );
+
+        stat = filePlug.setString( MString( path ) );
+        check_status( stat );
+
+        MObject ret = fnTex.object( &stat );
+        check_status( stat );
+
+        return ret;
+}
+
-int BspImporter::GetShaderIndex( const std::vector< q3::dshader_t > &shaders, int shaderNum, int lightmapNum )
-{
@@ -172 +223 @@
-
-        MStatus stat;
+
+        MDGModifier dgMod;
+
-        MFnLambertShader fnShader;
-
@@ -185 +239 @@
-        MObject shaderObj = fnShader.object( &stat );
-        check_status( stat );
+
+        MObject texObj = ImportTexture( shader.shader );
+        if( texObj != MObject::kNullObj )
+        {
+                MFnDependencyNode fnTex( texObj, &stat );
+                check_status( stat );
+
+                MPlug texColorPlug = fnTex.findPlug( MString( "outColor" ), &stat );
+                check_status( stat );
+                //MPlug texTransPlug = fnTex.findPlug( MString( "outTransparency" ), &stat );
+                //check_status( stat );
+
+                MPlug shaderColorPlug = fnShader.findPlug( MString( "color" ), &stat );
+                check_status( stat );
+                //MPlug shaderTransPlug = fnShader.findPlug( MString( "transparency" ), &stat );
+                //check_status( stat );
+
+
+                stat = dgMod.connect( texColorPlug, shaderColorPlug );
+                check_status( stat );
+                //stat = dgMod.connect( texTransPlug, shaderTransPlug );
+                //check_status( stat );
+        }
-
-        MFnSet fnGroup;
@@ -200 +277 @@
-        MObject groupObj = fnGroup.object( &stat );
-        check_status( stat );
-
-        MDGModifier dgMod;
-
-        MPlugArray connections;
@@ -717 +792 @@
-}
-
-
+, const char *basePath
-{
-        size_t base_pos = stm.tellg();
@@ -728 +803 @@
-
-        m_fileData = &in;
+        m_basePath = basePath;
-
-        ParseEntities();
@@ -773 +849 @@
-                file.open( filename.resolvedFullName().asChar(), std::ios::in | std::ios::binary );
-
+                MString basePath = filename.resolvedPath();
+
+                basePath = basePath.substring( 0, basePath.length() - 2 );
+
+                int idx = basePath.rindex( '/' );
+                if( idx > 0 )
+                        basePath = basePath.substring( 0, idx );
+
-                try
-                {
@@ -789 +873 @@
-
-                        BspImporter imp;
-
+, basePath.asChar()
-                }
-                catch( std::exception &ex )

trunk/maya2q3/maya_entry.cpp

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