Changeset 561

Timestamp:

04/17/08 12:00:20 (9 months ago)

Author:

phill

Message:

o Light grid import (I hope this is good enough).

Files:

• trunk/common/math-vector.h (modified) (1 diff)
• trunk/maya2q3/bsp-local.h (modified) (1 diff)
• trunk/maya2q3/bsp.cpp (modified) (5 diffs)
• trunk/maya2q3/maya_entry.cpp (modified) (1 diff)

trunk/common/math-vector.h

@@ -140 +140 @@
-inline vec3 abs( const vec3 &v ) { return vec3c( abs( v.x ), abs( v.y ), abs( v.z ) ); }
-
+inline vec3 ceil( const vec3 &v ) { return vec3c( ceil( v.x ), ceil( v.y ), ceil( v.z ) ); }
+inline vec3 floor( const vec3 &v ) { return vec3c( floor( v.x ), floor( v.y ), floor( 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; }
-

trunk/maya2q3/bsp-local.h

@@ -31 +31 @@
-Literal EkMessage = "message";
-Literal EkDeluxeMapping = "deluxemapping";
+Literal EkLightGridSize = "gridsize";
-Literal EkOrigin = "origin";
-Literal EkAngle = "angle";

trunk/maya2q3/bsp.cpp

@@ -61 +61 @@
-        MDagPathArray m_lightPaths;
-
+        MDagPath m_lightGridPoints;
+
-        std::vector< std::pair< int, int > > m_shaderMap;
-        std::vector< std::vector< int > > m_shaderFaceNums;
@@ -105 +107 @@
-        void CreateShaderQuickSelects();
-        void CreateQuickSelect( const MSelectionList &sel, const MString &name );
+
+        void ImportLightGridPoints();
-
-        void ParseEntities();
@@ -742 +746 @@
-                check_status( stat );
-        }
+
+        {
+                MDagPath path = m_lightGridPoints;
+
+                stat = path.pop();
+                check_status( stat );
+
+                MObject obj = path.node( &stat );
+                check_status( stat );
+
+                stat = fnParent.addChild( obj );
+                check_status( stat );
+        }
-}
-
@@ -824 +841 @@
-}
-
+void BspImporter::ImportLightGridPoints()
+{
+        MStatus stat;
+
+        std::vector< q3::dmodel_t > models = ReadLump< q3::dmodel_t >( q3::LUMP_MODELS );
+        if( models.size() < 1 )
+                throw std::exception( "Missing world model record." );
+        const q3::dmodel_t &wm = models[0];
+        
+        vec3 size = m_entities[0].AsVec3( EkLightGridSize, vec3c( 64, 64, 128 ) );
+        
+        vec3 mins = size * ceil( wm.mins / size );
+        vec3 maxs = size * floor( wm.maxs / size );
+        
+        vec3 bounds = floor( (maxs - mins) / size ) + vec3c( 1 );
+
+        MFloatPointArray points;
+        MIntArray counts, indices;
+
+        for( float z = 0; z < bounds.z; z++ )
+        {
+                for( float y = 0; y < bounds.y; y++ )
+                {
+                        for( float x = 0; x < bounds.x; x++ )
+                        {
+                                points.append( MFloatPoint( q3::Q3VecToMaya( mins + vec3c( x, y, z ) ) ) );
+                        }
+                }
+        }
+
+        MFnMesh mesh;
+        MObject meshObj = mesh.create( points.length(), counts.length(), points, counts, indices, MObject::kNullObj, &stat );
+        check_status( stat );
+
+        stat = mesh.updateSurface();
+        check_status( stat );
+
+        MDagPath path;
+        stat = mesh.getPath( path );
+        check_status( stat );
+
+        m_lightGridPoints = path;
+
+        stat = path.pop();
+        check_status( stat );
+
+        MFnDagNode fnParent( path, &stat );
+        check_status( stat );
+
+        fnParent.setName( MString( "lightgrid" ), &stat );
+        check_status( stat );
+}
+
-void BspImporter::Import( std::istream &stm, const MObject &parentXform, const char *basePath )
-{
@@ -844 +914 @@
-
-        ImportEntityLights();
+        ImportLightGridPoints();
-
-        GroupNodes( parentXform );

trunk/maya2q3/maya_entry.cpp

@@ -26 +26 @@
-
-static const char *g_vendor = "HermitWorks";
-6
+7
-static const char *g_reqVer = "Any";
-