Changeset 540

Timestamp:

03/06/08 05:59:35 (10 months ago)

Author:

phill

Message:

o Now imports texture coordinates.
o Now imports lightmap texture coordinates.
o Now imports shaders.

Files:

• trunk/bin/win32/release (8.5)/bin/maya2q3.mll (modified) (previous)
• trunk/bin/win32/release (8.5)/bin/maya2q3.pdb (modified) (previous)
• trunk/common/util-string.h (modified) (1 diff)
• trunk/common/util.h (modified) (3 diffs)
• trunk/glew/build/vc2005/glew_static.vcproj (modified) (1 diff)
• trunk/libx42pp/include/x42util.h (modified) (1 diff)
• trunk/maya2q3/bsp.cpp (modified) (8 diffs)
• trunk/maya2q3/common.h (modified) (2 diffs)
• trunk/maya2q3/maya2q3.vcproj (modified) (15 diffs)
• trunk/maya2q3/maya_entry.cpp (modified) (1 diff)
• trunk/maya2q3/util-ext.cpp (modified) (1 diff)
• trunk/maya2q3/util-maya2q3.h (modified) (1 diff)
• trunk/physfs/physfs_static.vcproj (modified) (1 diff)

trunk/common/util-string.h

@@ -122 +122 @@
-        }
-
-
+ const
-        {
-                return strlen( val );

trunk/common/util.h

@@ -27 +27 @@
-void demand( bool cond, const char *msg );
-
+#ifdef assert
+#undef assert
+#endif
+
-#ifdef _DEBUG
-#define assert demand
@@ -142 +146 @@
-        END_ENUM_WITH_TYPE_OPEN( E, T )                                 \
-END_OPEN_ENUM( E )
+
+class bad_int_cast : public std::exception
+{
+public:
+        bad_int_cast( void ) : std::exception( "Integer conversion caused loss of data." ) { }
+        virtual ~bad_int_cast( void ) { }
+};
+
+template< typename T, size_t num_bits = sizeof( T ) * CHAR_BIT >
+struct integer_traits
+{
+private:
+        template< size_t num_bits >
+        struct signed_max
+        {
+                static const T val = (T)(signed_max< num_bits - 1 >::val << 1) | 0x1;
+        };
+
+        template< >
+        struct signed_max< 2 >
+        {
+                static const T val = (T)0x1;
+        };
+
+        template< >
+        struct signed_max< 1 >
+        {
+                //can't have a 1-bit signed value
+        };
+
+        template< >
+        struct signed_max< 0 >
+        {
+                //can't have a 0-bit signed value
+        };
+
+        template< size_t num_bits >
+        struct signed_min
+        {
+                static const T val = (T)((signed_min< num_bits - 1 >::val) << 1);
+        };
+
+        template< >
+        struct signed_min< 2 >
+        {
+                static const T val = (T)0x2;
+        };
+
+        template< >
+        struct signed_min< 1 >
+        {
+                //can't have a 1-bit signed value
+        };
+
+        template< >
+        struct signed_min< 0 >
+        {
+                //can't have a 0-bit signed value
+        };
+
+        template< size_t num_bits >
+        struct unsigned_max
+        {
+                static const T val = (T)(unsigned_max< num_bits - 1 >::val << 1) | 0x1;
+        };
+
+        template< >
+        struct unsigned_max< 1 >
+        {
+                static const T val = (T)0x1;
+        };
+
+        template< >
+        struct unsigned_max< 0 >
+        {
+                //can'g have a 0-bit unsigned value
+        };
+
+public:
+        static const bool is_signed = (((T)-1) < 0);
+        static const T max_val = is_signed ? signed_max< num_bits >::val : unsigned_max< num_bits >::val;
+        static const T min_val = is_signed ? signed_min< num_bits >::val : (T)0;
+
+        static const T bit_width = num_bits;
+};
+
+#pragma warning( push )
+#pragma warning( disable : 4127 ) //constant conditional --by design
+
+template< typename O, typename I >
+inline O checked_int_cast( const I &in )
+{
+        typedef integer_traits<O> ot;
+
+        if( in < ot::min_val || in > ot::max_val )
+                throw bad_int_cast();
+
+        return static_cast< O >( in );
+}
+
+#pragma warning( pop )
+
+#define lengthof( a ) (sizeof( a ) / sizeof( (a)[0] ))
+
+template< typename T >
+inline T align( T p, T a )
+{
+        return ((p + a - (T)1) / a) * a;
+}
+
+template< typename T >
+inline T* align( T *p, intptr_t a )
+{
+        return (T*)align( (intptr_t)p, a );
+}
+
+template< typename T >
+inline bool is_pow_2( T i )
+{
+        return (i & (i - 1)) == 0;
+}
+
+template< typename T >
+inline int log2_fast( T i )
+{
+        for( int log = 0; log < integer_traits< T >::bit_width; log++ )
+                if( (T)1 << log == i )
+                        return log;
+
+        return -1;
+}
-
-typedef unsigned char byte;
@@ -162 +297 @@
-#endif
-
-#define __decl_minmax_s( T ) const T min_##T = ~(((T)~(T)0) >> 1); const T max_##T = ((T)~(T)0) >> 1; //min val is only high bit, max is all but high bit  
-#define __decl_minmax_u( T ) const T min_##T = 0; const T max_##T = (T)~(T)0;
-
-__decl_minmax_u( byte ) __decl_minmax_s( sbyte )
-__decl_minmax_u( ushort ) __decl_minmax_s( short )
-__decl_minmax_u( uint ) __decl_minmax_s( int )
-__decl_minmax_u( uintptr ) __decl_minmax_s( intptr )
-__decl_minmax_u( uhuge ) __decl_minmax_s( huge )
-
-#undef __decl_minmax_s
-#undef __decl_minmax_u
-
-struct argb
-{

trunk/glew/build/vc2005/glew_static.vcproj

@@ -46 +46 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="2"
-1
+2
-                                AdditionalIncludeDirectories="../../include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;VC_EXTRALEAN;GLEW_STATIC"
-                                StringPooling="true"
-0
+2
-                                EnableFunctionLevelLinking="true"
-                                PrecompiledHeaderFile=".\static/release/glew_static.pch"

trunk/libx42pp/include/x42util.h

@@ -28 +28 @@
-namespace util
-{
-
-#pragma once
-
-class bad_int_cast

trunk/maya2q3/bsp.cpp

@@ -25 +25 @@
-{
-
-MeshData
+Importer
-{
-public:
+        BspImporter( void );
+        void Import( std::istream &stm );
+
+private:
-        float m_unitScale;
+        bool m_combineMeshes;
-
-        MPointArray m_verts;
+
-        MIntArray m_faceCounts;
-        MIntArray m_faceVertIndices;
-
+        MIntArray m_textureUVIDs;
+        MFloatArray m_textureU, m_textureV;
+        MIntArray m_lightmapUVIDs;
+        MFloatArray m_lightmapU, m_lightmapV;
+
+        MColorArray m_vertexLight;
+        MIntArray m_vertexLightIDs;
+
-        std::vector< q3::Patch > m_patchStaging;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                int firstVert = 0, int vertexCount = -1, int firstIndex = 0, int indexCount = -1 );
-
-
-
-
-
+
+
+
+
+
+
+
-};
-
-#pragma warning( disable : 4100 ) //shut up unreferenced parameter warnings until dev of this file is done
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        if( vertexCount == -1 )
@@ -69 +197 @@
-        int baseVert = (int)m_verts.length();
-        for( int i = 0; i < vertexCount; i++ )
-
+
+
+
+
+
+
+
+
+
+
-
-        //ToDo: collapse out coplanar edges     (?)
@@ -76 +213 @@
-        for( int i = 0; i < numTris; i++ )
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                m_faceCounts.append( 3 );
@@ -84 +240 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        q3::StitchAllPatches( m_patchStaging );
-        q3::FixSharedVertexLodError( m_patchStaging );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -117 +316 @@
-}
-
-MeshData::AppendBSP
+Importer::Import
-{
-        size_t base_pos = stm.tellg();
@@ -123 +322 @@
-        BinaryReader in( stm );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        MStatus stat;
-
@@ -183 +338 @@
-        MObject ret = mesh.create( m_verts.length(), m_faceCounts.length(), m_verts,
-                m_faceCounts, m_faceVertIndices, MObject::kNullObj, &stat );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return ret;
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -243 +472 @@
-                try
-                {
-
+
+
+
+
+
+
-                }
-                catch( ... )

trunk/maya2q3/common.h

@@ -112 +112 @@
-#include <maya/MFnTransform.h>
-#include <maya/MItMeshPolygon.h>
+#include <maya/MFnLambertShader.h>
-
-#include <maya/MTime.h>
@@ -165 +166 @@
-#endif
-
+#include <boost/smart_ptr.hpp>
+
-#include "../common/math.h"
-#include "../common/math-vector.h"

trunk/maya2q3/maya2q3.vcproj

@@ -46 +46 @@
-                                MinimalRebuild="true"
-                                BasicRuntimeChecks="3"
-1
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -134 +134 @@
-                                AdditionalIncludeDirectories="$(ProgramFiles)\Alias\Maya6.0\include"
-                                PreprocessorDefinitions="NT_PLUGIN;GLEW_STATIC"
-0
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -226 +226 @@
-                                MinimalRebuild="true"
-                                BasicRuntimeChecks="3"
-0
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -314 +314 @@
-                                AdditionalIncludeDirectories="$(ProgramFiles)\Alias\Maya7.0\include"
-                                PreprocessorDefinitions="NT_PLUGIN;GLEW_STATIC"
-0
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -406 +406 @@
-                                MinimalRebuild="true"
-                                BasicRuntimeChecks="3"
-0
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -464 +464 @@
-                                Name="VCPostBuildEventTool"
-                                Description="Copying to Maya plugins directory."
-
-
+
-                        />
-                </Configuration>
@@ -495 +494 @@
-                                AdditionalIncludeDirectories="&quot;C:\Program Files (x86)\Autodesk\Maya8.5\include&quot;"
-                                PreprocessorDefinitions="NT_PLUGIN;GLEW_STATIC"
-0
+2
-                                DefaultCharIsUnsigned="true"
-                                TreatWChar_tAsBuiltInType="true"
@@ -562 +561 @@
-        <Files>
-                <Filter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        <File
-                                RelativePath=".\maya2q3_cmd.cpp"
@@ -583 +568 @@
-                        </File>
-                        <File
-                                RelativePath=".\maya_entry.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\md3.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\q3shader.cpp"
-                                >
@@ -608 +585 @@
-                        <File
-                                RelativePath=".\shader_node.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\util-ext.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\util.cpp"
-                                >
-                        </File>
-                </Filter>
-                <Filter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-