Revision: 34533
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34533
Author: jesterking
Date: 2011-01-27 19:39:06 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Commit to cope with API changes in OpenCOLLADA (latest for Windows right now
r827).
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=827
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/SConstruct
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.h
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/MeshImporter.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-01-27 19:36:11 UTC (rev 34532)
+++ trunk/blender/CMakeLists.txt 2011-01-27 19:39:06 UTC (rev 34533)
@@ -528,7 +528,7 @@
set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver
GeneratedSaxParser xml2 buffer ftoa)
+ set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver
GeneratedSaxParser xml2 buffer ftoa UTF)
set(PCRE_LIB pcre)
endif()
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2011-01-27 19:36:11 UTC (rev 34532)
+++ trunk/blender/SConstruct 2011-01-27 19:39:06 UTC (rev 34533)
@@ -143,6 +143,11 @@
Exit()
+env.Append(RCFLAGS="TEST=\"test it\"")
+print env['RCFLAGS']
+Exit()
+
+
cc = B.arguments.get('CC', None)
cxx = B.arguments.get('CXX', None)
if cc:
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2011-01-27
19:36:11 UTC (rev 34532)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2011-01-27
19:39:06 UTC (rev 34533)
@@ -146,7 +146,7 @@
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2
pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2
pcre buffer ftoa UTF'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
WITH_BF_LCMS = False
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2011-01-27
19:36:11 UTC (rev 34532)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2011-01-27
19:39:06 UTC (rev 34533)
@@ -148,7 +148,7 @@
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2
pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2
pcre buffer ftoa UTF'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
WITH_BF_LCMS = False
Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp 2011-01-27
19:36:11 UTC (rev 34532)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp 2011-01-27
19:39:06 UTC (rev 34533)
@@ -265,9 +265,9 @@
COLLADASW::JointsElement joints(mSW);
COLLADASW::InputList &input = joints.getInputList();
- input.push_back(COLLADASW::Input(COLLADASW::JOINT, // constant declared
in COLLADASWInputList.h
+ input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::JOINT, //
constant declared in COLLADASWInputList.h
COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id)));
- input.push_back(COLLADASW::Input(COLLADASW::BINDMATRIX,
+ input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::BINDMATRIX,
COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, inv_bind_mat_source_id)));
joints.add();
}
@@ -425,9 +425,9 @@
COLLADASW::InputList &input = weights.getInputList();
int offset = 0;
- input.push_back(COLLADASW::Input(COLLADASW::JOINT, // constant declared
in COLLADASWInputList.h
+ input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::JOINT, //
constant declared in COLLADASWInputList.h
COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id), offset++));
- input.push_back(COLLADASW::Input(COLLADASW::WEIGHT,
+ input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::WEIGHT,
COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, weights_source_id), offset++));
weights.setCount(me->totvert);
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-01-27
19:36:11 UTC (rev 34532)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2011-01-27
19:39:06 UTC (rev 34533)
@@ -296,10 +296,11 @@
class AnimationExporter: COLLADASW::LibraryAnimations
{
Scene *scene;
+ COLLADASW::StreamWriter *sw;
public:
- AnimationExporter(COLLADASW::StreamWriter *sw):
COLLADASW::LibraryAnimations(sw) {}
+ AnimationExporter(COLLADASW::StreamWriter *sw):
COLLADASW::LibraryAnimations(sw) { this->sw = sw; }
void exportAnimations(Scene *sce)
{
@@ -357,22 +358,22 @@
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
// create input source
- std::string input_id =
create_source_from_fcurve(Sampler::INPUT, fcu, anim_id, axis_name);
+ std::string input_id =
create_source_from_fcurve(COLLADASW::InputSemantic::INPUT, fcu, anim_id,
axis_name);
// create output source
- std::string output_id =
create_source_from_fcurve(Sampler::OUTPUT, fcu, anim_id, axis_name);
+ std::string output_id =
create_source_from_fcurve(COLLADASW::InputSemantic::OUTPUT, fcu, anim_id,
axis_name);
// create interpolations source
std::string interpolation_id =
create_interpolation_source(fcu->totvert, anim_id, axis_name);
std::string sampler_id = std::string(anim_id) +
SAMPLER_ID_SUFFIX;
- COLLADASW::LibraryAnimations::Sampler sampler(sampler_id);
+ COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
std::string empty;
- sampler.addInput(Sampler::INPUT, COLLADABU::URI(empty,
input_id));
- sampler.addInput(Sampler::OUTPUT, COLLADABU::URI(empty,
output_id));
+ sampler.addInput(COLLADASW::InputSemantic::INPUT,
COLLADABU::URI(empty, input_id));
+ sampler.addInput(COLLADASW::InputSemantic::OUTPUT,
COLLADABU::URI(empty, output_id));
// this input is required
- sampler.addInput(Sampler::INTERPOLATION, COLLADABU::URI(empty,
interpolation_id));
+ sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION,
COLLADABU::URI(empty, interpolation_id));
addSampler(sampler);
@@ -533,28 +534,28 @@
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
// create input source
- std::string input_id =
create_source_from_vector(Sampler::INPUT, fra, is_rot, anim_id, axis_name);
+ std::string input_id =
create_source_from_vector(COLLADASW::InputSemantic::INPUT, fra, is_rot,
anim_id, axis_name);
// create output source
std::string output_id;
if (axis == -1)
output_id = create_xyz_source(v, fra.size(), anim_id);
else
- output_id = create_source_from_array(Sampler::OUTPUT,
v, fra.size(), is_rot, anim_id, axis_name);
+ output_id =
create_source_from_array(COLLADASW::InputSemantic::OUTPUT, v, fra.size(),
is_rot, anim_id, axis_name);
// create interpolations source
std::string interpolation_id =
create_interpolation_source(fra.size(), anim_id, axis_name);
std::string sampler_id = std::string(anim_id) +
SAMPLER_ID_SUFFIX;
- COLLADASW::LibraryAnimations::Sampler sampler(sampler_id);
+ COLLADASW::LibraryAnimations::Sampler sampler(sw, sampler_id);
std::string empty;
- sampler.addInput(Sampler::INPUT, COLLADABU::URI(empty,
input_id));
- sampler.addInput(Sampler::OUTPUT, COLLADABU::URI(empty,
output_id));
+ sampler.addInput(COLLADASW::InputSemantic::INPUT,
COLLADABU::URI(empty, input_id));
+ sampler.addInput(COLLADASW::InputSemantic::OUTPUT,
COLLADABU::URI(empty, output_id));
// TODO create in/out tangents source
// this input is required
- sampler.addInput(Sampler::INTERPOLATION, COLLADABU::URI(empty,
interpolation_id));
+ sampler.addInput(COLLADASW::InputSemantic::INTERPOLATION,
COLLADABU::URI(empty, interpolation_id));
addSampler(sampler);
@@ -574,18 +575,18 @@
return COLLADABU::Math::Utils::radToDegF(angle);
}
- std::string get_semantic_suffix(Sampler::Semantic semantic)
+ std::string get_semantic_suffix(COLLADASW::InputSemantic::Semantics
semantic)
{
switch(semantic) {
- case Sampler::INPUT:
+ case COLLADASW::InputSemantic::INPUT:
return INPUT_SOURCE_ID_SUFFIX;
- case Sampler::OUTPUT:
+ case COLLADASW::InputSemantic::OUTPUT:
return OUTPUT_SOURCE_ID_SUFFIX;
- case Sampler::INTERPOLATION:
+ case COLLADASW::InputSemantic::INTERPOLATION:
return INTERPOLATION_SOURCE_ID_SUFFIX;
- case Sampler::IN_TANGENT:
+ case COLLADASW::InputSemantic::IN_TANGENT:
return INTANGENT_SOURCE_ID_SUFFIX;
- case Sampler::OUT_TANGENT:
+ case COLLADASW::InputSemantic::OUT_TANGENT:
return OUTTANGENT_SOURCE_ID_SUFFIX;
default:
break;
@@ -594,13 +595,13 @@
}
void add_source_parameters(COLLADASW::SourceBase::ParameterNameList&
param,
- Sampler::Semantic
semantic, bool is_rot, const char *axis)
+
COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis)
{
switch(semantic) {
- case Sampler::INPUT:
+ case COLLADASW::InputSemantic::INPUT:
param.push_back("TIME");
break;
- case Sampler::OUTPUT:
+ case COLLADASW::InputSemantic::OUTPUT:
if (is_rot) {
param.push_back("ANGLE");
}
@@ -615,8 +616,8 @@
}
}
break;
- case Sampler::IN_TANGENT:
- case Sampler::OUT_TANGENT:
+ case COLLADASW::InputSemantic::IN_TANGENT:
+ case COLLADASW::InputSemantic::OUT_TANGENT:
param.push_back("X");
param.push_back("Y");
break;
@@ -625,14 +626,14 @@
}
}
- void get_source_values(BezTriple *bezt, Sampler::Semantic semantic,
bool rotation, float *values, int *length)
+ void get_source_values(BezTriple *bezt,
COLLADASW::InputSemantic::Semantics semantic, bool rotation, float *values, int
*length)
{
switch (semantic) {
- case Sampler::INPUT:
+ case COLLADASW::InputSemantic::INPUT:
*length = 1;
values[0] = convert_time(bezt->vec[1][0]);
break;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
