Author: cowboycoder
Date: Sat Dec 20 00:15:01 2008
New Revision: 525
URL: http://svn.gna.org/viewcvs/cal3d?rev=525&view=rev
Log:
Merged the TRY-IMVU_merge branch into the trunk (r498-r523).
Changes include:
-ability to have morph target meshes stored in the CalSubMesh. Each morph mesh
can have it's own weight applied with Physique blending their individual
weights at runtime.
-limited ability to play a canned morph animation (.xpf) with the
MorphTargetMixer.
-Max plugin modified to export morph target meshes and morph animations (buggy!
could crash.)
-updated Visual Studio project files to VS2008 (makefiles not modified)
Merged code not 100% tested/verified. Use with caution.
Added:
trunk/cal3d/plugins/cal3d_max_exporter/MaxMorphAnimationExport.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/cal3d_max_exporter/MaxMorphAnimationExport.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxMorphAnimationExport.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/cal3d_max_exporter/MaxMorphAnimationExport.h
trunk/cal3d/plugins/cal3d_max_exporter/MaxMorphAnimationExportDesc.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/cal3d_max_exporter/MaxMorphAnimationExportDesc.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxMorphAnimationExportDesc.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/cal3d_max_exporter/MaxMorphAnimationExportDesc.h
trunk/cal3d/plugins/cal3d_max_exporter/MaxMorphAnimationExportMaxscriptCall.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/cal3d_max_exporter/MaxMorphAnimationExportMaxscriptCall.cpp
trunk/cal3d/plugins/src/MorphAnimationCandidate.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/MorphAnimationCandidate.cpp
trunk/cal3d/plugins/src/MorphAnimationCandidate.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/MorphAnimationCandidate.h
trunk/cal3d/plugins/src/win32/MorphAnimationExportSheet.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/win32/MorphAnimationExportSheet.cpp
trunk/cal3d/plugins/src/win32/MorphAnimationExportSheet.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/win32/MorphAnimationExportSheet.h
trunk/cal3d/plugins/src/win32/MorphAnimationTimePage.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/win32/MorphAnimationTimePage.cpp
trunk/cal3d/plugins/src/win32/MorphAnimationTimePage.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/plugins/src/win32/MorphAnimationTimePage.h
trunk/cal3d/src/cal3d/calxmlbindings.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/calxmlbindings.cpp
trunk/cal3d/src/cal3d/calxmlbindings.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/calxmlbindings.h
trunk/cal3d/src/cal3d/coreanimatedmorph.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coreanimatedmorph.cpp
trunk/cal3d/src/cal3d/coreanimatedmorph.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coreanimatedmorph.h
trunk/cal3d/src/cal3d/coremorphkeyframe.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coremorphkeyframe.cpp
trunk/cal3d/src/cal3d/coremorphkeyframe.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coremorphkeyframe.h
trunk/cal3d/src/cal3d/coremorphtrack.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coremorphtrack.cpp
trunk/cal3d/src/cal3d/coremorphtrack.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/coremorphtrack.h
trunk/cal3d/src/cal3d/tinybind.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/tinybind.cpp
trunk/cal3d/src/cal3d/tinybind.h
- copied unchanged from r523, branches/TRY-IMVU_merge/src/cal3d/tinybind.h
trunk/cal3d/src/cal3d/xmlformat.cpp
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/xmlformat.cpp
trunk/cal3d/src/cal3d/xmlformat.h
- copied unchanged from r523,
branches/TRY-IMVU_merge/src/cal3d/xmlformat.h
Modified:
trunk/cal3d/cal3d.sln
trunk/cal3d/examples/cally/cally.vcproj
trunk/cal3d/examples/miniviewer_d3d/cal3d_miniviewer_d3d.vcproj
trunk/cal3d/examples/miniviewer_d3d_bump/cal3d_miniviewer_d3d_bump.vcproj
trunk/cal3d/examples/miniviewer_d3d_vs/cal3d_miniviewer_d3d_vs.vcproj
trunk/cal3d/examples/miniviewer_gl/cal3d_miniviewer.vcproj
trunk/cal3d/examples/miniviewer_gl_vp/cal3d_miniviewer_gl_vp.vcproj
trunk/cal3d/plugins/cal3d_max_exporter/MaxAnimationExportMaxscriptCall.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxInterface.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxInterface.h
trunk/cal3d/plugins/cal3d_max_exporter/MaxMaterial.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxMaterial.h
trunk/cal3d/plugins/cal3d_max_exporter/MaxMesh.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxMesh.h
trunk/cal3d/plugins/cal3d_max_exporter/MaxMeshExportMaxscriptCall.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxNode.cpp
trunk/cal3d/plugins/cal3d_max_exporter/MaxNode.h
trunk/cal3d/plugins/cal3d_max_exporter/StdAfx.h
trunk/cal3d/plugins/cal3d_max_exporter/cal3d_max_exporter.cpp
trunk/cal3d/plugins/cal3d_max_exporter/cal3d_max_exporter.h
trunk/cal3d/plugins/cal3d_max_exporter/cal3d_max_exporter.vcproj
trunk/cal3d/plugins/cal3d_max_importer/cal3d_importer.vcproj
trunk/cal3d/plugins/cal3d_maya_exporter/cal3d_maya_exporter.vcproj
trunk/cal3d/plugins/cal3d_milk_exporter/cal3d_milk_exporter.vcproj
trunk/cal3d/plugins/src/BaseInterface.h
trunk/cal3d/plugins/src/BaseMaterial.h
trunk/cal3d/plugins/src/BaseMesh.h
trunk/cal3d/plugins/src/BaseNode.h
trunk/cal3d/plugins/src/Exporter.cpp
trunk/cal3d/plugins/src/Exporter.h
trunk/cal3d/plugins/src/MaterialCandidate.cpp
trunk/cal3d/plugins/src/MaterialCandidate.h
trunk/cal3d/plugins/src/MeshCandidate.cpp
trunk/cal3d/plugins/src/MeshCandidate.h
trunk/cal3d/plugins/src/SkeletonCandidate.cpp
trunk/cal3d/plugins/src/SkeletonCandidate.h
trunk/cal3d/plugins/src/VertexCandidate.cpp
trunk/cal3d/plugins/src/VertexCandidate.h
trunk/cal3d/plugins/src/win32/MeshExportSheet.h
trunk/cal3d/src/cal3d/animation.h
trunk/cal3d/src/cal3d/animation_action.cpp
trunk/cal3d/src/cal3d/animation_action.h
trunk/cal3d/src/cal3d/bone.cpp
trunk/cal3d/src/cal3d/bone.h
trunk/cal3d/src/cal3d/cal3d.h
trunk/cal3d/src/cal3d/cal3d.vcproj
trunk/cal3d/src/cal3d/cal3d_wrapper.cpp
trunk/cal3d/src/cal3d/coreanimation.cpp
trunk/cal3d/src/cal3d/coreanimation.h
trunk/cal3d/src/cal3d/corebone.cpp
trunk/cal3d/src/cal3d/corebone.h
trunk/cal3d/src/cal3d/corekeyframe.cpp
trunk/cal3d/src/cal3d/corekeyframe.h
trunk/cal3d/src/cal3d/corematerial.cpp
trunk/cal3d/src/cal3d/corematerial.h
trunk/cal3d/src/cal3d/coremesh.cpp
trunk/cal3d/src/cal3d/coremesh.h
trunk/cal3d/src/cal3d/coremodel.cpp
trunk/cal3d/src/cal3d/coremodel.h
trunk/cal3d/src/cal3d/coreskeleton.cpp
trunk/cal3d/src/cal3d/coreskeleton.h
trunk/cal3d/src/cal3d/coresubmesh.cpp
trunk/cal3d/src/cal3d/coresubmesh.h
trunk/cal3d/src/cal3d/coresubmorphtarget.cpp
trunk/cal3d/src/cal3d/coresubmorphtarget.h
trunk/cal3d/src/cal3d/coretrack.cpp
trunk/cal3d/src/cal3d/coretrack.h
trunk/cal3d/src/cal3d/datasource.h
trunk/cal3d/src/cal3d/global.h
trunk/cal3d/src/cal3d/loader.cpp
trunk/cal3d/src/cal3d/loader.h
trunk/cal3d/src/cal3d/mixer.cpp
trunk/cal3d/src/cal3d/mixer.h
trunk/cal3d/src/cal3d/morphtargetmixer.cpp
trunk/cal3d/src/cal3d/morphtargetmixer.h
trunk/cal3d/src/cal3d/physique.cpp
trunk/cal3d/src/cal3d/renderer.cpp
trunk/cal3d/src/cal3d/renderer.h
trunk/cal3d/src/cal3d/saver.cpp
trunk/cal3d/src/cal3d/saver.h
trunk/cal3d/src/cal3d/submesh.cpp
trunk/cal3d/src/cal3d/submesh.h
trunk/cal3d/src/cal3d_converter.vcproj
_______________________________________________
Cal3d-commits mailing list
[email protected]
https://mail.gna.org/listinfo/cal3d-commits
