Changeset 567

Timestamp:

04/23/08 16:54:32 (9 months ago)

Author:

phill

Message:

o More WIP.

Files:

• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (2 diffs)
• branches/morph-targets/libx42make/modelbuilder-write.cpp (modified) (2 diffs)
• branches/morph-targets/libx42make/modelbuilder.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/common.h (modified) (1 diff)
• branches/morph-targets/x42maya/modelexporter-gather.cpp (modified) (3 diffs)
• branches/morph-targets/x42maya/modelexporter.cpp (modified) (2 diffs)
• branches/morph-targets/x42maya/modelexporter.h (modified) (3 diffs)

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

@@ -598 +598 @@
-{
-public: 
-        std::vector< group_ptr >        groups;
-
-        uint lod_number() const { return _lod_number; }
-
-        group_ptr create_group( const std::string &surface_name = std::string(),
-                const std::string &material_name = std::string() );
+
+        size_t group_count() const { return groups.size(); }
+        group_ptr group( size_t i ) { return groups[i]; }
+        const_group_ptr group( size_t i ) const { return groups[i]; }
-
-        void split_large_groups(
@@ -617 +619 @@
-private:
-        uint                                            _lod_number;
+        std::vector< group_ptr >        groups;
-
-        model_builder                           *owner;

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

@@ -460 +460 @@
-                outLod.firstGroup = (u16)groups.size();
-
-s.size
+_count
-                {
-s[i]
+( i )
-                        x42group_t out;
-                        
@@ -573 +573 @@
-                const_lod_ptr lod = data.lod( l );
-                
-s.size
+_count
-                {
-s[i]
+( i )
-
-                        if( !geom.is_valid() )

branches/morph-targets/libx42make/modelbuilder.cpp

@@ -55 +55 @@
-        const std::string &material_name )
-{
-
+make::
-
-        ret->surface_name = surface_name;

branches/morph-targets/x42maya/common.h

@@ -147 +147 @@
-#include "util.h"
-
-translato
+modelexporte
-
-#include "X42FileTranslator.h"

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

@@ -58 +58 @@
-        }
-
-path
+get
-
-        //see if we already have this bone in the list
-        for( size_t i = 0; i < model.bone_count(); i++ )
-        {
-path
+get
-                        return model.bone( i );
-        }
@@ -88 +88 @@
-                
-                stat = pp.pop();
-
+.statusCode()
-                {
-                case MS::kSuccess:
@@ -118 +118 @@
-
-        bool static_anim = true;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/morph-targets/x42maya/modelexporter.cpp

@@ -30 +30 @@
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -241 +283 @@
-}
-
+void model_exporter::allow_skin_modifier( const MString &modifier_type,
+        const MString &out_plug, const MString &in_plug )
+{
+        dg_nav nav;
+        
+        nav.type = modifier_type;
+        nav.out_plug = out_plug;
+        nav.in_plug = in_plug;
+
+        allowed_skin_mods.push_back( nav );
+}
+
-void model_exporter::add_objects( const export_selection &sel )
-{

branches/morph-targets/x42maya/modelexporter.h

@@ -50 +50 @@
-};
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-typedef make::simple_api_tag< MObject > obj_tag;
@@ -97 +148 @@
-
-        void write_file( std::ostream &out );
+
+        void allow_skin_modifier( const MString &modifier_type,
+                const MString &out_plug, const MString &in_plug );
-
-        static const int do_not_split = -1;
@@ -113 +167 @@
-        make::group_split_limits split_limits;
-
+        struct dg_nav
+        {
+                MString type;                   //the name of the allowed node
+                MString out_plug;               //the plug we're pulling data from
+                MString in_plug;                //the plug to follow up stream
+        };
+        std::vector< dg_nav > allowed_skin_mods;
+
-        bone_ptr import_bone( const MDagPath &path );
+
+        MObject get_skin_input( const MObject &draw_mesh );
+        uint get_lod_number( const MObject &mesh );
+        group_ptr get_group_for_set( uint lod_num, const MObject &set_obj );
+
+        void add_skinned_mesh( const MDagPath &draw_mesh_path, const MObject &skin_obj );
+        void add_rigid_mesh( const MDagPath &draw_mesh_path );
-};
-