[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54250] trunk/blender/source/blender/ collada: Fix some warnings in the collade code, but did not fix two because they seem
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Feb 1 16:17:52 CET 2013
Revision: 54250
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54250
Author: blendix
Date: 2013-02-01 15:17:51 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Fix some warnings in the collade code, but did not fix two because they seem
to indicate bugs, left a comment about those.
Modified Paths:
--------------
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.h
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -439,11 +439,11 @@
std::vector<float> fra;
//char prefix[256];
- FCurve *fcu = (FCurve *)ob_arm->adt->action->curves.first;
-
//Check if there is a fcurve in the armature for the bone in param
//when baking this check is not needed, solve every bone for every frame.
- /*while (fcu) {
+ /*FCurve *fcu = (FCurve *)ob_arm->adt->action->curves.first;
+
+ while (fcu) {
std::string bone_name = getObjectBoneName(ob_arm, fcu);
int val = BLI_strcasecmp((char *)bone_name.c_str(), bone->name);
if (val == 0) break;
@@ -901,8 +901,7 @@
bPoseChannel *parchan = NULL;
bPoseChannel *pchan = NULL;
- bPoseChannel *rootchan = NULL;
-
+
if (ob->type == OB_ARMATURE ){
bPose *pose = ob->pose;
pchan = BKE_pose_channel_find_name(pose, bone->name);
Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -111,12 +111,12 @@
return true;
}
+#if 0
void ArmatureExporter::operator()(Object *ob)
{
Object *ob_arm = bc_get_assigned_armature(ob);
}
-#if 0
bool ArmatureExporter::already_written(Object *ob_arm)
{
@@ -248,7 +248,7 @@
void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node& node)
{
- bPoseChannel *pchan = BKE_pose_channel_find_name(ob_arm->pose, bone->name);
+ //bPoseChannel *pchan = BKE_pose_channel_find_name(ob_arm->pose, bone->name);
float mat[4][4];
Modified: trunk/blender/source/blender/collada/ArmatureExporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.h 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/ArmatureExporter.h 2013-02-01 15:17:51 UTC (rev 54250)
@@ -67,7 +67,7 @@
//void export_controllers(Scene *sce);*/
- void operator()(Object *ob);
+ //void operator()(Object *ob);
private:
Scene *scene;
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -200,7 +200,6 @@
void ArmatureImporter::fix_leaf_bones( )
{
// just setting tail for leaf bones here
- float correctionMin = 1.0f;
std::vector<LeafBone>::iterator it;
for (it = leaf_bones.begin(); it != leaf_bones.end(); it++) {
LeafBone& leaf = *it;
@@ -212,7 +211,7 @@
mul_v3_fl(vec, leaf_bone_length);
add_v3_v3v3(leaf.bone->tail, leaf.bone->head , vec);
- }
+ }
}
#if 0
@@ -466,8 +465,6 @@
float mat[4][4];
float obmat[4][4];
- float angle = 0.0f;
-
// object-space
get_node_mat(obmat, root_node, NULL, NULL);
@@ -492,6 +489,7 @@
}
+ //float angle = 0.0f;
///*mat4_to_axis_angle(ax, &angle, mat);
//pchan->bone->roll = angle;*/
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -393,6 +393,7 @@
//skip the basis
kb = kb->next;
for (; kb; kb = kb->next) {
+ // XXX why is the weight not used here and set to 0.0?
float weight = kb->curval;
extra.addExtraTechniqueParameter ("KHR", "morph_weights" , 0.000, "MORPH_WEIGHT_TO_TARGET");
}
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -414,7 +414,7 @@
std::string name;
short* type = 0;
et->setData("type", type);
- bConstraint * con = BKE_add_ob_constraint(ob, "Test_con", *type);
+ BKE_add_ob_constraint(ob, "Test_con", *type);
}
}
@@ -425,8 +425,6 @@
bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
bool read_transform = true;
- ExtraTags *et = getExtraTags(node->getUniqueId());
-
std::vector<Object *> *objects_done = new std::vector<Object *>();
if (is_joint) {
Modified: trunk/blender/source/blender/collada/SceneExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/SceneExporter.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -209,7 +209,6 @@
cti->get_constraint_targets(con, &targets);
if(cti){
- int i = 1;
for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next){
obtar = ct->tar;
std::string tar_id(id_name(obtar));
Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp 2013-02-01 15:17:39 UTC (rev 54249)
+++ trunk/blender/source/blender/collada/TransformReader.cpp 2013-02-01 15:17:51 UTC (rev 54250)
@@ -47,6 +47,7 @@
COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
if(type == COLLADAFW::Transformation::MATRIX){
+ // XXX why does this return and discard all following transformations?
dae_matrix_to_mat4(tm, mat);
return;
}
More information about the Bf-blender-cvs
mailing list