[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61516] trunk/lib/ darwin-9.x.universal/opencollada: OSX/Collada: update to git rev 3335ac164e68b2512a40914b14c74db260e6ff7d, 64bit only
jens verwiebe
info at jensverwiebe.de
Fri May 1 21:08:12 CEST 2015
Revision: 61516
https://developer.blender.org/rBL61516
Author: jensverwiebe
Date: 2015-05-01 19:08:10 +0000 (Fri, 01 May 2015)
Log Message:
-----------
OSX/Collada: update to git rev 3335ac164e68b2512a40914b14c74db260e6ff7d, 64bit only
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/opencollada/README.rtf
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWSampler.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWValidate.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryAnimationsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryControllersLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLFormulasLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWExtraTechnique.h
trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAStreamWriter/COLLADASWInstanceGeometry.h
trunk/lib/darwin-9.x.universal/opencollada/lib/libGeneratedSaxParser.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libMathMLSolver.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADABaseUtils.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAFramework.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libOpenCOLLADAStreamWriter.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libUTF.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libbuffer.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libftoa.a
trunk/lib/darwin-9.x.universal/opencollada/lib/libpcre.a
Modified: trunk/lib/darwin-9.x.universal/opencollada/README.rtf
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/README.rtf 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/README.rtf 2015-05-01 19:08:10 UTC (rev 61516)
@@ -1,12 +1,14 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Menlo-Regular;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww18660\viewh9160\viewkind0
\deftab720
\pard\pardeftab720
-\f0\fs24 \cf0 git rev 828b60384552b83e55d2af7055f07d2c40b4d3f4\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+\f0\fs24 \cf0 git rev
+\f1 \CocoaLigature0 3335ac164e68b2512a40914b14c74db260e6ff7d
+\f0 \CocoaLigature1 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\pardirnatural
\cf0 \
I compiled this time using xcode/clang\
\
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -23,7 +23,7 @@
# define COLLADABU_OS_WIN64
#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
# define COLLADABU_OS_WIN32
-#elif defined(__linux__) || defined(__linux)
+#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
# define COLLADABU_OS_LINUX
#endif
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -60,7 +60,16 @@
#define COLLADABU_HASH_NAMESPACE_CLOSE }
#define COLLADABU_HASH_FUN hash
#endif
-#else // Linux or Mac
+#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION)
+ #include <unordered_map>
+ #include <unordered_set>
+ #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
+ #define COLLADABU_HASH_SET std::unordered_set
+ #define COLLADABU_HASH_NAMESPACE_OPEN std
+ #define COLLADABU_HASH_NAMESPACE_CLOSE
+ #define COLLADABU_HASH_FUN hash
+#else // Linux or Mac or FreeBSD with GCC
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
#include <ext/hash_map>
#include <ext/hash_set>
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -38,13 +38,26 @@
SHADER_PHONG,
SHADER_LAMBERT
};
+
+ /**
+ * There is a transparent color and a transparency value with an opaque mode in COLLADA.
+ * We have to calculate with this the opaque color for the framework.
+ */
+ enum OpaqueMode
+ {
+ UNSPECIFIED_OPAQUE,
+ A_ONE,
+ RGB_ZERO,
+ A_ZERO,
+ RGB_ONE
+ };
private:
/**
* The original object id, if it in the original file format exist.
- */
- String mOriginalId;
+ */
+ String mOriginalId;
/** The shader used by the effect.*/
ShaderType mShaderType;
@@ -117,24 +130,16 @@
*/
ColorOrTexture mOpacity;
-// /** Declares the color of perfectly refracted light.
-// Used by the following shaders:
-// Blinn
-// Constant
-// Phong
-// Lambert
-// */
-// ColorOrTexture mTransparent;
-//
-// /** Declares the amount of perfectly refracted light added to the reflected color as a
-// scalar value between 0.0 and 1.0.
-// Used by the following shaders:
-// Blinn
-// Constant
-// Phong
-// Lambert
-// */
-// FloatOrParam mTransparency;
+ /** Declares transparent color.
+ Note: this property should only be used if one wants to know the value that were used to compute the final opacity color
+ */
+
+ ColorOrTexture mTransparent;
+
+ /** Declares the transparency value.
+ Note: this property should only be used if one wants to know the value that were used to compute the final opacity color
+ */
+ FloatOrParam mTransparency;
/** Declares the index of refraction for perfectly refracted light as a single scalar index.
Used by the following shaders:
@@ -148,6 +153,9 @@
/** All the samplers used as texture in the CommonEffect.*/
SamplerPointerArray mSamplers;
+ /** Declares the opaque mode */
+ OpaqueMode mOpaqueMode;
+
public:
/** Constructor. */
@@ -158,12 +166,12 @@
/**
* The original object id, if it in the original file format exist.
- */
+ */
const String& getOriginalId () const { return mOriginalId; }
/**
* The original object id, if it in the original file format exist.
- */
+ */
void setOriginalId ( const String& val ) { mOriginalId = val; }
@@ -251,6 +259,17 @@
*/
void setDiffuse ( const ColorOrTexture& Diffuse ) { mDiffuse = Diffuse; }
+ /** Declares the transparent color
+ */
+ const ColorOrTexture& getTransparent () const { return mTransparent; }
+
+ /** Declares the transparent color
+ */
+ ColorOrTexture& getTransparent () { return mTransparent; }
+
+ /** Declares the transparent color
+ */
+ void setTransparent ( const ColorOrTexture& transparent ) { mTransparent = transparent; }
/** Declares the color of light specularly reflected from the surface of this object.
Used by the following shaders:
@@ -353,6 +372,26 @@
*/
void setReflectivity( const FloatOrParam& Reflectivity ) { mReflectivity = Reflectivity; }
+ /** Declares the transparency value
+ */
+ FloatOrParam& getTransparency() { return mTransparency; }
+
+ /** Declares the transparency value
+ */
+ const FloatOrParam& getTransparency() const { return mTransparency; }
+
+ /** Declares the transparency value
+ */
+ void setTransparency( const FloatOrParam& transparency ) { mTransparency = transparency; }
+
+ /** Declares the opaque mode
+ */
+ OpaqueMode getOpaqueMode() const { return mOpaqueMode; }
+
+ /** Declares the transparency value
+ */
+ void setOpaqueMode(OpaqueMode opaqueMode ) { mOpaqueMode = opaqueMode; }
+
/** Declares the opaque color.
Used by the following shaders:
Blinn
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -126,9 +126,9 @@
public:
Unit ()
- : mLinearUnitUnit ( CENTIMETER )
- , mLinearUnitName ( LINEAR_UNIT_CENTIMETER_NAME )
- , mLinearUnitMeter ( LINEAR_UNIT_CENTIMETER )
+ : mLinearUnitUnit ( METER )
+ , mLinearUnitName ( LINEAR_UNIT_METER_NAME )
+ , mLinearUnitMeter ( LINEAR_UNIT_METER )
, mAngularUnitName ( ANGULAR_UNIT_DEGREES_NAME )
, mAngularUnitUnit ( DEGREES )
, mTimeUnitName ( TIME_UNIT_FILM_NAME )
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -15,7 +15,11 @@
#include "COLLADAFWInstanceBase.h"
#include "COLLADAFWMaterialBinding.h"
+#include "COLLADABUURI.h"
+#include <vector>
+
+
namespace COLLADAFW
{
@@ -49,7 +53,10 @@
/** Returns the list of all material bindings.*/
const MaterialBindingArray& getMaterialBindings() const { return mMaterialBindings; }
-
+
+ /** Returns a reference to all the skeletons from this controller */
+ std::vector <COLLADABU::URI> &skeletons() { return mSkeletons; }
+
private:
/** Default copy constructor. */
@@ -59,7 +66,8 @@
{
pre.mMaterialBindings.cloneArray ( mMaterialBindings );
}
-
+
+ std::vector <COLLADABU::URI> mSkeletons;
};
} // namespace COLLADAFW
Modified: trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h 2015-04-29 20:24:31 UTC (rev 61515)
+++ trunk/lib/darwin-9.x.universal/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitiveWithFaceVertexCount.h 2015-05-01 19:08:10 UTC (rev 61516)
@@ -6,18 +6,18 @@
Licensed under the MIT Open Source License,
for details please see LICENSE file or the website
http://www.opensource.org/licenses/mit-license.php
-*/
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list