Changeset 559

Timestamp:

04/11/08 00:25:47 (9 months ago)

Author:

phill

Message:

o Undid random loader crap.

Files:

• branches/morph-targets/libx42/include/x42.h (modified) (2 diffs)
• branches/morph-targets/libx42/libx42.vcproj (modified) (2 diffs)
• branches/morph-targets/libx42/load-int1.inc.h (deleted)
• branches/morph-targets/libx42/load-int2.inc.h (deleted)
• branches/morph-targets/libx42/load.c (modified) (8 diffs)
• branches/morph-targets/libx42/load.i (deleted)
• branches/morph-targets/libx42/load_old.c (deleted)
• branches/morph-targets/libx42/persist-datatypes.inc.h (deleted)
• branches/morph-targets/libx42make/include/x42make-modelbuilder.h (modified) (5 diffs)
• branches/morph-targets/libx42make/modelbuilder-animation.cpp (modified) (1 diff)
• branches/morph-targets/libx42make/modelbuilder-influences.cpp (modified) (3 diffs)
• branches/morph-targets/libx42make/modelbuilder-skeleton.cpp (modified) (7 diffs)
• branches/morph-targets/libx42make/modelbuilder-write.cpp (modified) (7 diffs)
• branches/morph-targets/libx42make/modelbuilder.cpp (modified) (1 diff)
• branches/morph-targets/libx42pp/include/x42util.h (modified) (2 diffs)
• branches/morph-targets/x42info/main.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/modelexporter-anim.cpp (deleted)
• branches/morph-targets/x42maya/modelexporter.cpp (modified) (1 diff)
• branches/morph-targets/x42maya/translator.h (modified) (1 diff)
• branches/morph-targets/x42maya/x42maya.vcproj (modified) (1 diff)

branches/morph-targets/libx42/include/x42.h

@@ -316 +316 @@
-*/
-X42_EXPORT x42header_t* X42_CALL x42_LoadHeaderFromBuffer( void *out_buffer, const void **file_data );
-//
+
-
-/*
@@ -339 +339 @@
-
-X42_EXPORT x42data_t* X42_CALL x42_LoadDataFromBuffer( void *out_buffer, const x42header_t *h, uint persist_flags, const void *file_data );
-//
+
-
-/***********************************

branches/morph-targets/libx42/libx42.vcproj

@@ -912 +912 @@
-                </File>
-                <File
-                        RelativePath=".\load-int1.inc.h"
-                        >
-                </File>
-                <File
-                        RelativePath=".\load-int2.inc.h"
-                        >
-                </File>
-                <File
-                        RelativePath=".\load.c"
-                        >
-                        <FileConfiguration
-                                Name="Debug (.NET)|Win32"
-                                >
-                                <Tool
-                                        Name="VCCLCompilerTool"
-                                        GeneratePreprocessedFile="1"
-                                />
-                        </FileConfiguration>
-                </File>
-                <File
-                        RelativePath=".\load_old.c"
-                        >
-                </File>
@@ -1020 +1000 @@
-                </File>
-                <File
-                        RelativePath=".\persist-datatypes.inc.h"
-                        >
-                </File>
-                <File
-                        RelativePath=".\pose.c"
-                        >

branches/morph-targets/libx42/load.c

@@ -32 +32 @@
-ALWAYS_INLINE f32 swap_f32( f32 f ) { union { u32 i; f32 f; } u; u.f = f; u.i = swap_u32( u.i ); return u.f; }
-
-
-
-
-size_t                 pos
-
-
-static bool align_buf_ptr( bufSrc_t *src, size_t a
-
-
-{
-       size_t ofs = ((a - (src->pos % a)) % a);
-
-       if( ofs )
-{
-
-               src->pos += ofs;
-}
+
+
+
+demand_rf( h != NULL, X42_ERR_BADPTR, "Expected valid x42Header pointer, got NULL instead." )
+
+
+       if( h->ident != X42_IDENT
+
+
+switch( h->version )
+{
+
+case X42_VER_V6:
+break;    
+
+default:
+return false;
-        }
-
@@ -54 +54 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        byte *buf = (byte*)buffer;
@@ -67 +91 @@
-        while( cb )
-        {
-source->stm.read_fn( buf, cb, source->stm.
+file_stream->read_fn( buf, cb, file_stream->
-
-                demand_rv( cr <= cb, X42_ERR_BADSTREAM, "stream returned more data than requested", cbRead );
@@ -78 +102 @@
-        }
-
-        source->pos += cbRead;
-        return cbRead;
-}
-
-
-
-
-
-
+
+
-        if( a )
-        {
-
+
+
+
+
+
+
+
+
+
-
-                if( ofs )
-
-
-
-
-
+
+
+
+
-        return true;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        size_t len;
@@ -114 +307 @@
-                        len = sizeof( tmp );
-
-src
+file_stream
-
-                demand_rf( cbR != 0, X42_ERR_INTERNAL, "failed to skip stream bytes - EOF?" );
@@ -124 +317 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-#ifndef LIBX42_NO_PARAM_VALIDATION
-
+
+
-#endif
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-        case X42_VER_V5:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+