[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61517] trunk/lib/win64_vc12/ opencollada: Bump OpenCollada
Martijn Berger
martijn.berger at gmail.com
Sat May 2 21:54:53 CEST 2015
Revision: 61517
https://developer.blender.org/rBL61517
Author: juicyfruit
Date: 2015-05-02 19:54:46 +0000 (Sat, 02 May 2015)
Log Message:
-----------
Bump OpenCollada
Modified Paths:
--------------
trunk/lib/win64_vc12/opencollada/build.bat
trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWSampler.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWTechnique.h
trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWValidate.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryAnimationsLoader.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryControllersLoader.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLFormulasLoader15.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h
trunk/lib/win64_vc12/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h
trunk/lib/win64_vc12/opencollada/include/COLLADAStreamWriter/COLLADASWExtraTechnique.h
trunk/lib/win64_vc12/opencollada/include/COLLADAStreamWriter/COLLADASWInstanceGeometry.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADABaseUtils/COLLADABUhash_map.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWEffectCommon.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWFileInfo.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWInstanceBindingBase.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWSampler.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWTechnique.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAFramework/COLLADAFWValidate.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryAnimationsLoader.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryControllersLoader.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/COLLADASaxFWLLoader.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLFormulasLoader15.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWExtraTechnique.h
trunk/lib/win64_vc12/opencollada/include/opencollada/COLLADAStreamWriter/COLLADASWInstanceGeometry.h
trunk/lib/win64_vc12/opencollada/lib/opencollada/GeneratedSaxParser.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/MathMLSolver.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/MathMLSolver_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADAFramework.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/UTF.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/UTF_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/buffer.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/buffer_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/ftoa.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/ftoa_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/pcre.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/pcre_d.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/xml.lib
trunk/lib/win64_vc12/opencollada/lib/opencollada/xml_d.lib
Modified: trunk/lib/win64_vc12/opencollada/build.bat
===================================================================
--- trunk/lib/win64_vc12/opencollada/build.bat 2015-05-01 19:08:10 UTC (rev 61516)
+++ trunk/lib/win64_vc12/opencollada/build.bat 2015-05-02 19:54:46 UTC (rev 61517)
@@ -4,12 +4,11 @@
setlocal
set OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
-set OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8"
+set OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d"
:CheckOS
IF EXIST "%PROGRAMFILES(X86)%" (set bit=x64) ELSE (set bit=x86)
-call :CheckBuildSystem
call :CheckPath
@@ -30,6 +29,12 @@
cd %RET_DIR%
+cd opencollada
+call :Build
+
+cd %RET_DIR%
+
+
exit /b
@@ -37,7 +42,7 @@
mkdir build\windows
cd build\windows
-cmake -G "%BUILD_GEN%" ..\.. ^
+cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\opencollada ^
-DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
@@ -47,15 +52,14 @@
-DCMAKE_C_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
-DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
- -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="libcmt.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
- -DUSE_STATIC=ON ^
- -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
+ -DUSE_STATIC=ON
if NOT errorlevel 0 (
echo cmake failed
exit /b
)
-call %BUILD_CMD% install
+call msbuild INSTALL.vcxproj /p:Configuration=Release
goto:eof
@@ -65,7 +69,7 @@
mkdir build\windows_debug
cd build\windows_debug
-cmake -G "%BUILD_GEN%" ..\.. ^
+cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\opencollada\debug ^
-DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
@@ -75,15 +79,14 @@
-DCMAKE_C_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
-DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
- -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="libcmt.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib libcnt.lib" ^
- -DUSE_STATIC=ON ^
- -DCMAKE_BUILD_TYPE=Debug
+ -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
+ -DUSE_STATIC=ON
if NOT errorlevel 0 (
echo cmake failed
exit /b
)
-call %BUILD_CMD% install
+call msbuild INSTALL.vcxproj /p:Configuration=Debug
goto:eof
@@ -104,20 +107,6 @@
pause
goto:eof
-:CheckBuildSystem
-ninja >nul 2>&1
-if errorlevel 9009 (
- echo using nmake
- set BUILD_CMD=nmake
- set "BUILD_GEN=NMake Makefiles"
-) else (
- echo You got Ninja in your patch using that to for make files
- set BUILD_CMD=ninja
- set BUILD_GEN="Ninja"
-)
-goto:eof
-
-
:CheckPath
echo Checking for git in the path
diff >nul 2>&1
Modified: trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h
===================================================================
--- trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2015-05-01 19:08:10 UTC (rev 61516)
+++ trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUPlatform.h 2015-05-02 19:54:46 UTC (rev 61517)
@@ -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/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
===================================================================
--- trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2015-05-01 19:08:10 UTC (rev 61516)
+++ trunk/lib/win64_vc12/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h 2015-05-02 19:54:46 UTC (rev 61517)
@@ -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/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h
===================================================================
--- trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h 2015-05-01 19:08:10 UTC (rev 61516)
+++ trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWEffectCommon.h 2015-05-02 19:54:46 UTC (rev 61517)
@@ -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/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h
===================================================================
--- trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h 2015-05-01 19:08:10 UTC (rev 61516)
+++ trunk/lib/win64_vc12/opencollada/include/COLLADAFramework/COLLADAFWFileInfo.h 2015-05-02 19:54:46 UTC (rev 61517)
@@ -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 )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list