Merged v1-8 into default

CMake/Packages/FindFreetype.cmake

@@ -31,7 +31,7 @@ clear_if_changed(FREETYPE_PREFIX_PATH
   FREETYPE_INCLUDE_DIR
 )
 
-set(FREETYPE_LIBRARY_NAMES freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
+set(FREETYPE_LIBRARY_NAMES freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
 get_debug_names(FREETYPE_LIBRARY_NAMES)
 
 use_pkgconfig(FREETYPE_PKGC freetype2)

CMake/Templates/SDK_CMakeLists.txt.in

@@ -114,7 +114,7 @@ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 		# search names with "lib". This is the workaround.
 		set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "")
 	endif ()
-	set(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+	set(Boost_ADDITIONAL_VERSIONS "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
 	# Components that need linking (NB does not include header-only components like bind)
 	set(OGRE_BOOST_COMPONENTS thread date_time)
 	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
@@ -123,6 +123,15 @@ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 		set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
 		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
 	endif()
+	if (Boost_FOUND AND WIN32 AND Boost_USE_STATIC_LIBS)
+		if(Boost_VERSION GREATER 104700)
+			set(OGRE_BOOST_COMPONENTS thread date_time system)
+		endif()
+		if(Boost_VERSION GREATER 104900)
+			set(OGRE_BOOST_COMPONENTS thread date_time system chrono)
+		endif()
+		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+	endif()
 	find_package(Boost QUIET)
 
 	# Set up referencing of Boost
@@ -132,7 +141,7 @@ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 else()
 	set(BOOST_LIBRARYDIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/release")
 	set(Boost_USE_STATIC_LIBS TRUE)
-	set(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+	set(Boost_ADDITIONAL_VERSIONS "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
 	# Components that need linking (NB does not include header-only components like bind)
 	set(OGRE_BOOST_COMPONENTS thread date_time)
 	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
@@ -141,6 +150,15 @@ else()
 		set(Boost_USE_STATIC_LIBS NOT ${Boost_USE_STATIC_LIBS})
 		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
 	endif()
+	if (Boost_FOUND AND WIN32 AND Boost_USE_STATIC_LIBS)
+		if(Boost_VERSION GREATER 104700)
+			set(OGRE_BOOST_COMPONENTS thread date_time system)
+		endif()
+		if(Boost_VERSION GREATER 104900)
+			set(OGRE_BOOST_COMPONENTS thread date_time system chrono)
+		endif()
+		find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+	endif()
 	find_package(Boost QUIET)
 
 	# Set up referencing of Boost

Components/RTShaderSystem/include/OgreShaderCGProgramProcessor.h

@@ -51,23 +51,23 @@ class _OgreRTSSExport CGProgramProcessor : public ProgramProcessor
 
 	/** Class constructor.
 	*/
-	CGProgramProcessor			();
+	CGProgramProcessor();
 
 	/** Class destructor */
-	virtual ~CGProgramProcessor	();
+	virtual ~CGProgramProcessor();
 
 	/** Return the target language of this processor. */
-	virtual const String&		getTargetLanguage	() const { return TargetLanguage; }
+	virtual const String& getTargetLanguage() const { return TargetLanguage; }
 
 	/** 
 	@see ProgramProcessor::preCreateGpuPrograms
 	*/
-	virtual bool				preCreateGpuPrograms			(ProgramSet* programSet);
+	virtual bool preCreateGpuPrograms(ProgramSet* programSet);
 
 	/** 
 	@see ProgramProcessor::postCreateGpuPrograms
 	*/
-	virtual bool				postCreateGpuPrograms			(ProgramSet* programSet);
+	virtual bool postCreateGpuPrograms(ProgramSet* programSet);
 
 	static String TargetLanguage;
 

Components/RTShaderSystem/include/OgreShaderCGProgramWriter.h

@@ -51,56 +51,58 @@ class _OgreRTSSExport CGProgramWriter : public ProgramWriter
 
 	/** Class constructor. 
 	*/
-	CGProgramWriter	();
+	CGProgramWriter();
 
 	/** Class destructor */
-	virtual ~CGProgramWriter ();
+	virtual ~CGProgramWriter();
 
 	/** 
 	@see ProgramWriter::writeSourceCode.
 	*/
-	virtual void			writeSourceCode			(std::ostream& os, Program* program);
+	virtual void writeSourceCode(std::ostream& os, Program* program);
 
 	/** 
 	@see ProgramWriter::getTargetLanguage.
 	*/
-	virtual const String&  getTargetLanguage			() const { return TargetLanguage; }
+	virtual const String& getTargetLanguage() const { return TargetLanguage; }
 
 	static String TargetLanguage;
 
 // Protected methods.
 protected:
 
 	/** Initialize string maps. */
-	void		initializeStringMaps		();
+	void initializeStringMaps();
 
 	/** Write the program dependencies. */
-	void		writeProgramDependencies	(std::ostream& os, Program* program);
+	void writeProgramDependencies(std::ostream& os, Program* program);
 
 	/** Write a uniform parameter. */
-	void		writeUniformParameter		(std::ostream& os, UniformParameterPtr parameter);
+	void writeUniformParameter(std::ostream& os, UniformParameterPtr parameter);
 
 	/** Write a function parameter. */
-	void		writeFunctionParameter		(std::ostream& os, ParameterPtr parameter);
+	void writeFunctionParameter(std::ostream& os, ParameterPtr parameter);
 
 	/** Write a local parameter. */
-	void		writeLocalParameter			(std::ostream& os, ParameterPtr parameter);
+	void writeLocalParameter(std::ostream& os, ParameterPtr parameter);
 
 	/** Write a function declaration. */
-	void		writeFunctionDeclaration	(std::ostream& os, Function* function, ParameterPtr & colorParameter);
+	void writeFunctionDeclaration(std::ostream& os, Function* function, ParameterPtr & colorParameter);
 
 	/** Write function atom instance. */
-	void		writeAtomInstance			(std::ostream& os, FunctionAtom* atom);
+	void writeAtomInstance(std::ostream& os, FunctionAtom* atom);
 
 
 protected:
-	typedef		map<GpuConstantType, const char*>::type		GpuConstTypeToStringMap;
-	typedef		map<Parameter::Semantic, const char*>::type	ParamSemanticToStringMap;
+	typedef map<GpuConstantType, const char*>::type GpuConstTypeToStringMap;
+	typedef map<Parameter::Semantic, const char*>::type	ParamSemanticToStringMap;
 
 // Attributes.
 protected:
-	GpuConstTypeToStringMap		mGpuConstTypeMap;		// Map between GPU constant type to string value.
-	ParamSemanticToStringMap	mParamSemanticMap;		// Map between parameter semantic to string value.
+	// Map between GPU constant type to string value.
+	GpuConstTypeToStringMap mGpuConstTypeMap;
+	// Map between parameter semantic to string value.
+	ParamSemanticToStringMap mParamSemanticMap;
 };
 
 /** CG program writer factory implementation.

Components/RTShaderSystem/include/OgreShaderExDualQuaternionSkinning.h

@@ -65,20 +65,20 @@ class _OgreRTSSExport DualQuaternionSkinning : public HardwareSkinningTechnique
     /** Class default constructor */
     DualQuaternionSkinning();
 
-    /**
-    @see SubRenderState::resolveParameters.
-    */
-    virtual bool resolveParameters (ProgramSet* programSet);
-
-    /**
-    @see SubRenderState::resolveDependencies.
-    */
-    virtual bool resolveDependencies (ProgramSet* programSet);
-
-    /**
-    @see SubRenderState::addFunctionInvocations.
-    */
-    virtual bool addFunctionInvocations (ProgramSet* programSet);
+	/**
+	@see SubRenderState::resolveParameters.
+	*/
+	virtual bool resolveParameters(ProgramSet* programSet);
+
+	/**
+	@see SubRenderState::resolveDependencies.
+	*/
+	virtual bool resolveDependencies(ProgramSet* programSet);
+
+	/**
+	@see SubRenderState::addFunctionInvocations.
+	*/
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 // Protected methods
 protected:

Components/RTShaderSystem/include/OgreShaderExHardwareSkinning.h

@@ -156,23 +156,24 @@ class _OgreRTSSExport HardwareSkinning : public SubRenderState
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet);
+	virtual bool resolveParameters(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet);
+	virtual bool resolveDependencies(ProgramSet* programSet);
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet);
+	virtual bool addFunctionInvocations(ProgramSet* programSet);
 
 	SharedPtr<LinearSkinning> mLinear;
 	SharedPtr<DualQuaternionSkinning> mDualQuat;
 	SharedPtr<HardwareSkinningTechnique> mActiveTechnique;
 
-	const HardwareSkinningFactory* mCreator; ///The factory which created this sub render state
+	///The factory which created this sub render state
+	const HardwareSkinningFactory* mCreator;
 	SkinningType mSkinningType;
 };
 

Components/RTShaderSystem/include/OgreShaderExHardwareSkinningTechnique.h

@@ -101,17 +101,17 @@ class _OgreRTSSExport HardwareSkinningTechnique : public RTShaderSystemAlloc
 	/**
 	@see SubRenderState::resolveParameters.
 	*/
-	virtual bool resolveParameters (ProgramSet* programSet) = 0;
+	virtual bool resolveParameters(ProgramSet* programSet) = 0;
 
 	/**
 	@see SubRenderState::resolveDependencies.
 	*/
-	virtual bool resolveDependencies (ProgramSet* programSet) = 0;
+	virtual bool resolveDependencies(ProgramSet* programSet) = 0;
 
 	/**
 	@see SubRenderState::addFunctionInvocations.
 	*/
-	virtual bool addFunctionInvocations (ProgramSet* programSet) = 0;
+	virtual bool addFunctionInvocations(ProgramSet* programSet) = 0;
 
 protected:
 	/** Translates an index number to a mask value */