Changeset 568

Timestamp:

04/25/08 17:43:33 (9 months ago)

Author:

phill

Message:

o WIP stuff.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-geometry.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/modelexporter-gather.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/modelexporter.h (modified) (1 diff)

branches/morph-targets/libx42make/include/x42make-modelbuilder.h

@@ -498 +498 @@
-        morph_target_ptr find_morph_target( const std::string &name ) const;
-        morph_target_ptr create_morph_target( const std::string &name );
+
+        void append( const geometry &geom );
-
-        /*

branches/morph-targets/libx42make/modelbuilder-geometry.cpp

@@ -256 +256 @@
-}
-
+void geometry::append( const geometry &geom )
+{
+        if( !are_vert_arrays_parallell() )
+                throw error( "Can't append to an invalid group." );
+
+        if( !geom.are_vert_arrays_parallell() )
+                throw error( "Can't append an invalid group." );
+
+        if( geom.prim_type.to_list_type() != prim_type.to_list_type() )
+                throw error( "Can't append a group with an incompatible primitive type." );
+
+        size_t base_vert = base_shape.size();
+
+        base_shape.insert( base_shape.end(),
+                geom.base_shape.begin(), geom.base_shape.end() );
+        weights.insert( weights.end(),
+                geom.weights.begin(), geom.weights.end() );
+        attributes.insert( attributes.end(),
+                geom.attributes.begin(), geom.attributes.end() );
+
+        std::vector< bool > targets_appended( geom.morph_targets.size(), false );
+        for( size_t i = 0; i < morph_targets.size(); i++ )
+        {
+                morph_target_ptr dst = morph_targets[i];
+                const_morph_target_ptr src;
+
+                for( size_t j = 0; !src && j < geom.morph_targets.size(); j++ )
+                {
+                        if( geom.morph_targets[j]->name() == dst->name() )
+                        {
+                                src = geom.morph_targets[j];
+                                targets_appended[j] = true;
+                        }
+                }
+
+                if( src )
+                {
+                        dst->vertices.insert( dst->vertices.end(),
+                                src->vertices.begin(), src->vertices.end() );
+                }
+                else
+                {
+                        //pull in an identity target (copy the base shape)
+                        dst->vertices.insert( dst->vertices.end(),
+                                geom.base_shape.begin(), geom.base_shape.end() );
+                }
+        }
+
+        //add in any morph targets that haven't already been merged in
+        for( size_t i = 0; i < geom.morph_targets.size(); i++ )
+        {
+                if( targets_appended[i] )
+                        //already handled
+                        continue;
+
+                const_morph_target_ptr src = geom.morph_targets[i];
+                morph_target_ptr dst = create_morph_target( src->name() );
+
+                dst->vertices.insert( dst->vertices.end(),
+                        base_shape.begin(), base_shape.begin() + base_vert );
+                dst->vertices.insert( dst->vertices.end(),
+                        src->vertices.begin(), src->vertices.end() );
+        }
+
+        if( geom.prim_type == prim_type )
+        {
+                indices.reserve( indices.size() + geom.indices.size() );
+                for( size_t i = 0; i < geom.indices.size(); i++ )
+                        indices.push_back( checked_int_cast< index >( geom.indices[i] + base_vert ) );
+        }
+        else
+        {
+                std::vector< index > list_indices = geom.get_list_indices();
+                indices.reserve( indices.size() + list_indices.size() );
+                for( size_t i = 0; i < list_indices.size(); i++ )
+                        indices.push_back( checked_int_cast< index >( list_indices[i] + base_vert ) );
+        }
+}
+
-void geometry::remap_vertices( const std::vector< index > &remap )
-{

branches/morph-targets/x42maya/modelexporter-gather.cpp

@@ -359 +359 @@
-}
-
+std::vector< mesh_part model_exporter::import_mesh_geometry( MObject &mesh_obj )
+{
+        MStatus stat;
+
+        MFnMesh mesh( mesh_obj, &stat );
+        check_status( stat );
+
+
+}
+
-};
-};

branches/morph-targets/x42maya/modelexporter.h

@@ -177 +177 @@
-        bone_ptr import_bone( const MDagPath &path );
-
+        struct mesh_part
+        {
+                std::string             surface_name;
+                std::string             shader_name;
+                make::geometry  geometry;
+        };
+
+        std::vector< mesh_part > import_mesh_geometry( MObject &mesh_obj );
+
-        MObject get_skin_input( const MObject &draw_mesh );
-        uint get_lod_number( const MObject &mesh );