2nd try to merge sim_physics with trunk rev 19825

Please check if volumetrics are yet working 

1 files changed, 226 insertions, 226 deletions

diff --git a/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj b/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
index 0c35bc62e99..1cad6209aa3 100644
--- a/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
+++ b/projectfiles_vc7/gameengine/videotexture/TEX_Video.vcproj
@@ -1,226 +1,226 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="TEX_Video"

-	ProjectGUID="{670EC17A-0548-4BBF-A27B-636C7C188139}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"

-			IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"

-				StringPooling="FALSE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				DefaultCharIsUnsigned="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\debug\TEX_Video.pch"

-				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"

-				ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"

-				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"

-				WarningLevel="2"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\build\msvc_7\libs\debug\TEX_Video.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"

-			IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				DefaultCharIsUnsigned="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\TEX_Video.pch"

-				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"

-				ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"

-				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"

-				WarningLevel="2"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="0"

-				CompileAs="0"

-				ShowIncludes="FALSE"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\build\msvc_7\libs\TEX_Video.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\blendVideoTex.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.cpp">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\BlendType.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\Common.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.h">

-			</File>

-			<File

-				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.h">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="TEX_Video"
+	ProjectGUID="{670EC17A-0548-4BBF-A27B-636C7C188139}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"
+			IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
+				StringPooling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\debug\TEX_Video.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\debug\"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\build\msvc_7\libs\debug\TEX_Video.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"
+			IntermediateDirectory="..\..\..\..\build\msvc_7\source\gameengine\videotexture"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\Expressions;..\..\..\source\gameengine\GameLogic;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\Rasterizer;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf;..\..\..\source\blender\python;..\..\..\source\blender\gpu;..\..\..\source\kernel\gen_system;..\..\..\intern\string;..\..\..\intern\moto\include;..\..\..\intern\guardedalloc;..\..\..\intern\SoundSystem;..\..\..\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WITH_FFMPEG;__STDC_CONSTANT_MACROS"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\gamelogic\TEX_Video.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\gameengine\videotexture\"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"
+				CompileAs="0"
+				ShowIncludes="FALSE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\build\msvc_7\libs\TEX_Video.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\blendVideoTex.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\BlendType.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\Common.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\Exception.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBase.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterBlueScreen.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterColor.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterNormal.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\FilterSource.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBase.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageBuff.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageMix.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageRender.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\ImageViewport.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\PyTypeList.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\Texture.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoBase.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\VideoTexture\VideoFFmpeg.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>