[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53975] trunk/blender/source/blender/ collada: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Tue Jan 22 02:52:21 CET 2013
Revision: 53975
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53975
Author: gsrb3d
Date: 2013-01-22 01:52:16 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.h
Property Changed:
----------------
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.h
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-01-22 01:46:16 UTC (rev 53974)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-01-22 01:52:16 UTC (rev 53975)
@@ -1,598 +1,598 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor(s): Chingiz Dyussenov, Arystanbek Dyussenov, Jan Diederich, Tod Liverseed,
- * Nathan Letwory, Sukhitha Jayathilake
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/collada/ControllerExporter.cpp
- * \ingroup collada
- */
-
-#include "COLLADASWBaseInputElement.h"
-#include "COLLADASWInstanceController.h"
-#include "COLLADASWPrimitves.h"
-#include "COLLADASWSource.h"
-
-#include "DNA_action_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-
-#include "BKE_action.h"
-#include "BKE_armature.h"
-
-extern "C" {
-#include "BKE_main.h"
-#include "BKE_mesh.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-}
-
-#include "ED_armature.h"
-
-#include "BLI_listbase.h"
-
-#include "GeometryExporter.h"
-#include "ArmatureExporter.h"
-#include "ControllerExporter.h"
-#include "SceneExporter.h"
-
-#include "collada_utils.h"
-
-// XXX exporter writes wrong data for shared armatures. A separate
-// controller should be written for each armature-mesh binding how do
-// we make controller ids then?
-ControllerExporter::ControllerExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryControllers(sw), export_settings(export_settings) {
-}
-
-bool ControllerExporter::is_skinned_mesh(Object *ob)
-{
- return bc_get_assigned_armature(ob) != NULL;
-}
-
-
-void ControllerExporter::write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone)
-{
- if (bc_is_root_bone(bone, this->export_settings->deform_bones_only))
- ins.addSkeleton(COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_joint_id(bone, ob_arm)));
- else {
- for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
- write_bone_URLs(ins, ob_arm, child);
- }
- }
-}
-
-bool ControllerExporter::add_instance_controller(Object *ob)
-{
- Object *ob_arm = bc_get_assigned_armature(ob);
- bArmature *arm = (bArmature *)ob_arm->data;
-
- const std::string& controller_id = get_controller_id(ob_arm, ob);
-
- COLLADASW::InstanceController ins(mSW);
- ins.setUrl(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, controller_id));
-
- Mesh *me = (Mesh *)ob->data;
- if (!me->dvert) return false;
-
- // write root bone URLs
- Bone *bone;
- for (bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
- write_bone_URLs(ins, ob_arm, bone);
- }
-
- InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob, this->export_settings->active_uv_only);
-
- ins.add();
- return true;
-}
-
-void ControllerExporter::export_controllers(Scene *sce)
-{
- scene = sce;
-
- openLibrary();
-
- GeometryFunctor gf;
- gf.forEachMeshObjectInExportSet<ControllerExporter>(sce, *this, this->export_settings->export_set);
-
- closeLibrary();
-}
-
-void ControllerExporter::operator()(Object *ob)
-{
- Object *ob_arm = bc_get_assigned_armature(ob);
- Key *key = BKE_key_from_object(ob);
-
- if (ob_arm)
- export_skin_controller(ob, ob_arm);
- if(key){
- export_morph_controller(ob, key);
- }
-}
-#if 0
-
-bool ArmatureExporter::already_written(Object *ob_arm)
-{
- return std::find(written_armatures.begin(), written_armatures.end(), ob_arm) != written_armatures.end();
-}
-
-void ArmatureExporter::wrote(Object *ob_arm)
-{
- written_armatures.push_back(ob_arm);
-}
-
-void ArmatureExporter::find_objects_using_armature(Object *ob_arm, std::vector<Object *>& objects, Scene *sce)
-{
- objects.clear();
-
- Base *base = (Base *) sce->base.first;
- while (base) {
- Object *ob = base->object;
-
- if (ob->type == OB_MESH && get_assigned_armature(ob) == ob_arm) {
- objects.push_back(ob);
- }
-
- base = base->next;
- }
-}
-#endif
-
-std::string ControllerExporter::get_joint_sid(Bone *bone, Object *ob_arm)
-{
- return get_joint_id(bone, ob_arm);
-}
-
-std::string ControllerExporter::get_controller_id(Object *ob_arm, Object *ob)
-{
- return translate_id(id_name(ob_arm)) + "_" + translate_id(id_name(ob)) + SKIN_CONTROLLER_ID_SUFFIX;
-}
-
-std::string ControllerExporter::get_controller_id(Key *key, Object *ob)
-{
- return translate_id(id_name(ob)) + MORPH_CONTROLLER_ID_SUFFIX;
-}
-
-// ob should be of type OB_MESH
-// both args are required
-void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
-{
- // joint names
- // joint inverse bind matrices
- // vertex weights
-
- // input:
- // joint names: ob -> vertex group names
- // vertex group weights: me->dvert -> groups -> index, weight
-
-#if 0
- me->dvert :
-
- typedef struct MDeformVert {
- struct MDeformWeight *dw;
- int totweight;
- int flag; // flag only in use for weightpaint now
- } MDeformVert;
-
- typedef struct MDeformWeight {
- int def_nr;
- float weight;
- } MDeformWeight;
-#endif
-
- bool use_instantiation = this->export_settings->use_object_instantiation;
- Mesh *me;
-
- if (this->export_settings->apply_modifiers)
- me = bc_to_mesh_apply_modifiers(scene, ob, this->export_settings->export_mesh_type);
- else
- me = (Mesh *)ob->data;
-
- BKE_mesh_tessface_ensure(me);
-
- if (!me->dvert) return;
-
- std::string controller_name = id_name(ob_arm);
- std::string controller_id = get_controller_id(ob_arm, ob);
-
- openSkin(controller_id, controller_name,
- COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, use_instantiation)));
-
- add_bind_shape_mat(ob);
-
- std::string joints_source_id = add_joints_source(ob_arm, &ob->defbase, controller_id);
- std::string inv_bind_mat_source_id = add_inv_bind_mats_source(ob_arm, &ob->defbase, controller_id);
-
- std::list<int> vcounts;
- std::list<int> joints;
- std::list<float> weights;
-
- {
- int i, j;
-
- // def group index -> joint index
- std::vector<int> joint_index_by_def_index;
- bDeformGroup *def;
-
- for (def = (bDeformGroup *)ob->defbase.first, i = 0, j = 0; def; def = def->next, i++) {
- if (is_bone_defgroup(ob_arm, def))
- joint_index_by_def_index.push_back(j++);
- else
- joint_index_by_def_index.push_back(-1);
- }
-
- for (i = 0; i < me->totvert; i++) {
- MDeformVert *vert = &me->dvert[i];
- std::map<int, float> jw;
-
- // We're normalizing the weights later
- float sumw = 0.0f;
-
- for (j = 0; j < vert->totweight; j++) {
- int joint_index = joint_index_by_def_index[vert->dw[j].def_nr];
- if (joint_index != -1 && vert->dw[j].weight > 0.0f) {
- jw[joint_index] += vert->dw[j].weight;
- sumw += vert->dw[j].weight;
- }
- }
-
- if (sumw > 0.0f) {
- float invsumw = 1.0f / sumw;
- vcounts.push_back(jw.size());
- for (std::map<int, float>::iterator m = jw.begin(); m != jw.end(); ++m) {
- joints.push_back((*m).first);
- weights.push_back(invsumw * (*m).second);
- }
- }
- else {
- vcounts.push_back(0);
-#if 0
- vcounts.push_back(1);
- joints.push_back(-1);
- weights.push_back(1.0f);
-#endif
- }
- }
- }
-
- std::string weights_source_id = add_weights_source(me, controller_id, weights);
- add_joints_element(&ob->defbase, joints_source_id, inv_bind_mat_source_id);
- add_vertex_weights_element(weights_source_id, joints_source_id, vcounts, joints);
-
- if (this->export_settings->apply_modifiers)
- {
- BKE_libblock_free_us(&(G.main->mesh), me);
- }
- closeSkin();
- closeController();
-}
-
-void ControllerExporter::export_morph_controller(Object *ob, Key *key)
-{
- bool use_instantiation = this->export_settings->use_object_instantiation;
- Mesh *me;
-
- if (this->export_settings->apply_modifiers) {
- me = bc_to_mesh_apply_modifiers(scene, ob, this->export_settings->export_mesh_type);
- }
- else {
- me = (Mesh *)ob->data;
- }
- BKE_mesh_tessface_ensure(me);
-
- std::string controller_name = id_name(ob) + "-morph";
- std::string controller_id = get_controller_id(key, ob);
-
- openMorph(controller_id, controller_name,
- COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, use_instantiation)));
-
- std::string targets_id = add_morph_targets(key, ob);
- std::string morph_weights_id = add_morph_weights(key, ob);
-
- COLLADASW::TargetsElement targets(mSW);
-
- COLLADASW::InputList &input = targets.getInputList();
-
- input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::MORPH_TARGET, // constant declared in COLLADASWInputList.h
- COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, targets_id)));
- input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::MORPH_WEIGHT,
- COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, morph_weights_id)));
- targets.add();
-
- if (this->export_settings->apply_modifiers)
- {
- BKE_libblock_free_us(&(G.main->mesh), me);
- }
-
- //support for animations
- //can also try the base element and param alternative
- add_weight_extras(key);
- closeMorph();
- closeController();
-}
-
-std::string ControllerExporter::add_morph_targets(Key *key, Object *ob)
-{
- std::string source_id = translate_id(id_name(ob)) + TARGETS_SOURCE_ID_SUFFIX;
-
- COLLADASW::IdRefSource source(mSW);
- source.setId(source_id);
- source.setArrayId(source_id + ARRAY_ID_SUFFIX);
- source.setAccessorCount(key->totkey - 1);
- source.setAccessorStride(1);
-
- COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList();
- param.push_back("IDREF");
-
- source.prepareToAppendValues();
-
- KeyBlock * kb = (KeyBlock*)key->block.first;
- //skip the basis
- kb = kb->next;
- for (; kb; kb = kb->next) {
- std::string geom_id = get_geometry_id(ob, false) + "_morph_" + translate_id(kb->name);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list