Changeset 546

Timestamp:

03/13/08 18:30:26 (10 months ago)

Author:

phill

Message:

o Importing lights.

Files:

• trunk/common/util-string.h (modified) (1 diff)
• trunk/maya2q3/bsp.cpp (modified) (6 diffs)
• trunk/maya2q3/common.h (modified) (1 diff)
• trunk/maya2q3/q3shader_parse.cpp (modified) (4 diffs)
• trunk/maya2q3/util.cpp (modified) (2 diffs)

trunk/common/util-string.h

@@ -246 +246 @@
-//port of Com_ParseExt
-void ParseExt( const char *&data_p, bool allowLineBreaks, parse_token &tok );
+void ParseVector( float *v, int count, const char *&text, bool parseBrackets );
-void SkipRestOfLine( const char *&data );
-

trunk/maya2q3/bsp.cpp

@@ -25 +25 @@
-{
-
+typedef std::map< std::string, std::string > Entity;
+typedef const char *const Literal;
+
+Literal EkClassName = "classname";
+Literal EkMessage = "message";
+Literal EkDeluxeMapping = "deluxemapping";
+Literal EkOrigin = "origin";
+Literal EkAngle = "angle";
+Literal EkLight = "light";
+Literal EkColor = "_color";
+
+Literal EcWorldSpawn = "worldspawn";
+Literal EcLight = "light";
+
-class BspImporter
-{
@@ -52 +66 @@
-        MDagPathArray m_meshPaths;
-
+        std::vector< Entity > m_entities;
+
+        MObjectArray m_lights;
+        MDagPathArray m_lightPaths;
+
-        std::vector< std::pair< int, int > > m_shaderMap;
-        std::vector< std::vector< int > > m_shaderFaceNums;
@@ -90 +109 @@
-        void CreateQuickSelect( const MSelectionList &sel, const MString &name );
-
-
+
+
+
+
+
-};
-
@@ -524 +547 @@
-}
-
-
-
-
+
+
-        MStatus stat;
-
@@ -534 +556 @@
-        for( uint i = 0; i < m_meshPaths.length(); i++ )
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -552 +729 @@
-        m_fileData = &in;
-
+        ParseEntities();
+
-        ImportSurfaces();
-        CreateShaderQuickSelects();
+
+        ImportEntityLights();
+
+        GroupNodes( parentXform );
-}
-

trunk/maya2q3/common.h

@@ -113 +113 @@
-#include <maya/MItMeshPolygon.h>
-#include <maya/MFnLambertShader.h>
+#include <maya/MFnLight.h>
+#include <maya/MFnPointLight.h>
+#include <maya/MFnSpotLight.h>
-
-#include <maya/MTime.h>

trunk/maya2q3/q3shader_parse.cpp

@@ -49 +49 @@
-
-        memset( &m_time, 0, sizeof( m_time ) );
-}
-
-static bool ParseVector( const char *&text, int count, float *v )
-{
-        parse_token tok;
-
-        // FIXME: spaces are currently required after parens, should change parseext...
-        ParseExt( text, false, tok );
-        if( tok != "(" )
-        {
-                warn( "missing ( in shader" );
-                return false;
-        }
-
-        for( int i = 0; i < count ; i++ )
-        {
-                ParseExt( text, false, tok );
-                if( tok == "" )
-                        fail( "missing vector element in shader" );
-
-                if( v )
-                        v[i] = (float)atof( tok );
-        }
-
-        ParseExt( text, false, tok );
-        if( tok != ")" )
-        {
-                warn( "missing ) in shader" );
-                return false;
-        }
-
-        return true;
-}
-
@@ -589 +557 @@
-                        else if( tok == "const" )
-                        {
-text, 3, stage.rgb.c
+stage.rgb.c, 3,  text, true
-                                stage.rgb.type = RgbGen::Const;
-                        }
@@ -692 +660 @@
-                        else if( tok == "vector" )
-                        {
-text, 3, stage.bundle.texGenVecs[0]
-text, 3, stage.bundle.texGenVecs[1]
+stage.bundle.texGenVecs[0], 3, text, true
+stage.bundle.texGenVecs[1], 3, text, true
-
-                                stage.bundle.texGen = TexGen::Vector;
@@ -1024 +992 @@
-                {
-                        // fogParms
-
-
+
-
-                        ParseExt( text, false, tok );

trunk/maya2q3/util.cpp

@@ -30 +30 @@
-#endif
-
-msg
+std::exception( msg )
-}
-
@@ -211 +211 @@
-        data = p;
-}
+
+void ParseVector( float *v, int count, const char *&text, bool parseBrackets )
+{
+        parse_token tok;
+
+        if( parseBrackets )
+        {
+                ParseExt( text, false, tok );
+                demand( tok == "(", "missing (" );
+        }
+
+        for( int i = 0; i < count ; i++ )
+        {
+                ParseExt( text, false, tok );
+                demand( tok != "", "missing vector element" );
+
+                if( v )
+                        v[i] = (float)atof( tok );
+        }
+
+        if( parseBrackets )
+        {
+                ParseExt( text, false, tok );
+                demand( tok == ")", "missing )" );
+        }
+}