[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29009] branches/soc-2009-chingachgook/ source/blender/collada: COLLADA branch:
Arystanbek Dyussenov
arystan.d at gmail.com
Wed May 26 20:23:52 CEST 2010
Revision: 29009
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29009
Author: kazanbas
Date: 2010-05-26 20:23:52 +0200 (Wed, 26 May 2010)
Log Message:
-----------
COLLADA branch:
* partially fix #22388 by appending mesh object name to skin controller id (according to the patch provided by Tod Liverseed) (exporter). Importer still incorrectly handles the case when multiple meshes are linked to a single armature.
* add GPL blocks mentioning contributors. Hopefully didn't miss anyone.
Modified Paths:
--------------
branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp
branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.h
branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.h
branches/soc-2009-chingachgook/source/blender/collada/SConscript
branches/soc-2009-chingachgook/source/blender/collada/collada.cpp
branches/soc-2009-chingachgook/source/blender/collada/collada.h
branches/soc-2009-chingachgook/source/blender/collada/collada_internal.h
Modified: branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
@@ -908,7 +931,7 @@
Object *ob_arm = get_assigned_armature(ob);
bArmature *arm = (bArmature*)ob_arm->data;
- const std::string& controller_id = get_controller_id(ob_arm);
+ 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));
@@ -1051,9 +1074,9 @@
TransformWriter::add_node_transform(node, mat, NULL);
}
- std::string get_controller_id(Object *ob_arm)
+ std::string get_controller_id(Object *ob_arm, Object *ob)
{
- return translate_id(id_name(ob_arm)) + SKIN_CONTROLLER_ID_SUFFIX;
+ return translate_id(id_name(ob_arm)) + "_" + translate_id(id_name(ob)) + SKIN_CONTROLLER_ID_SUFFIX;
}
// ob should be of type OB_MESH
@@ -1087,7 +1110,7 @@
if (!me->dvert) return;
std::string controller_name = id_name(ob_arm);
- std::string controller_id = get_controller_id(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)));
Modified: branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.h
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.h 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.h 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
struct Scene;
class DocumentExporter
Modified: branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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, Nathan Letwory.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
// TODO:
// * name imported objects
// * import object rotation as euler
Modified: branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.h
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.h 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.h 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
struct Main;
struct bContext;
Modified: branches/soc-2009-chingachgook/source/blender/collada/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/SConscript 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/SConscript 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,4 +1,30 @@
#!/usr/bin/python
+# $Id$
+# ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Arystanbek Dyussenov, Nathan Letwory.
+#
+# ***** END GPL LICENSE BLOCK *****
+
Import ('env')
sources = env.Glob('*.cpp')
Modified: branches/soc-2009-chingachgook/source/blender/collada/collada.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/collada.cpp 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/collada.cpp 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
#include "BKE_main.h"
#include "BKE_scene.h"
#include "BKE_context.h"
Modified: branches/soc-2009-chingachgook/source/blender/collada/collada.h
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/collada.h 2010-05-26 18:16:16 UTC (rev 29008)
+++ branches/soc-2009-chingachgook/source/blender/collada/collada.h 2010-05-26 18:23:52 UTC (rev 29009)
@@ -1,3 +1,26 @@
+/**
+ * $Id$
+ *
+ * ***** 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,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list