[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49376] branches/ge_harmony/source/ gameengine: Fixing things up for GCC, MSVC was letting me get away with some things it shouldn't have.
Daniel Stokes
kupomail at gmail.com
Mon Jul 30 07:53:27 CEST 2012
Revision: 49376
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49376
Author: kupoman
Date: 2012-07-30 05:53:26 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Fixing things up for GCC, MSVC was letting me get away with some things it shouldn't have.
Modified Paths:
--------------
branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_IScene.h
branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.h
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Modified: branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-07-30 05:53:26 UTC (rev 49376)
@@ -370,7 +370,7 @@
for (uni = (Uniform *)shader->uniforms.first; uni; uni = uni->next) {
destinationscene->Update2DUniform(i, STR_String(uni->name), (RAS_IRasterizer::RAS_UNIFORM_TYPE)uni->type, uni->data);
}
- destinationscene->Update2DFilter(vector<STR_String>(), NULL, RAS_IRasterizer::RAS_2DFILTER_CUSTOMFILTER, i, text);
+ destinationscene->Update2DFilter(NULL, RAS_IRasterizer::RAS_2DFILTER_CUSTOMFILTER, i, text);
}
}
Modified: branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2012-07-30 05:53:26 UTC (rev 49376)
@@ -90,7 +90,7 @@
}
else if (m_type < RAS_IRasterizer::RAS_2DFILTER_NUMBER_OF_FILTERS)
{
- m_scene->Update2DFilter(m_propNames, m_gameobj, m_type, m_int_arg, m_shaderText);
+ m_scene->Update2DFilter(m_gameobj, m_type, m_int_arg, m_shaderText);
}
// once the filter is in place, no need to update it again => disable the actuator
return false;
Modified: branches/ge_harmony/source/gameengine/GameLogic/SCA_IScene.h
===================================================================
--- branches/ge_harmony/source/gameengine/GameLogic/SCA_IScene.h 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/GameLogic/SCA_IScene.h 2012-07-30 05:53:26 UTC (rev 49376)
@@ -68,8 +68,8 @@
void AddDebugProperty(class CValue* debugprop,
const STR_String &name);
void RemoveAllDebugProperties();
- virtual void Update2DUniform(int pass, STR_String& name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data){}
- virtual void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj,
+ virtual void Update2DUniform(int pass, STR_String name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data){}
+ virtual void Update2DFilter(void* gameObj,
RAS_IRasterizer::RAS_2DFILTER_MODE filtermode,
int pass, STR_String& text) {}
Modified: branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.cpp 2012-07-30 05:53:26 UTC (rev 49376)
@@ -1926,14 +1926,14 @@
return true;
}
-void KX_Scene::Update2DUniform(int pass, STR_String& name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data)
+void KX_Scene::Update2DUniform(int pass, STR_String name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data)
{
KX_GetActiveEngine()->GetRasterizer()->EnableUniform(pass, name, type, data);
}
-void KX_Scene::Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
+void KX_Scene::Update2DFilter(void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
{
- KX_GetActiveEngine()->GetRasterizer()->EnableFilter(propNames, gameObj, filtermode, pass, text);
+ KX_GetActiveEngine()->GetRasterizer()->EnableFilter(gameObj, filtermode, pass, text);
}
void KX_Scene::Render2DFilters(RAS_ICanvas* canvas)
Modified: branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h 2012-07-30 05:53:26 UTC (rev 49376)
@@ -581,8 +581,8 @@
/**
* 2D Filters
*/
- virtual void Update2DUniform(int pass, STR_String& name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data);
- void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
+ void Update2DUniform(int pass, STR_String name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data);
+ void Update2DFilter(void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
void Render2DFilters(RAS_ICanvas* canvas);
KX_ObstacleSimulation* GetObstacleSimulation() { return m_obstacleSimulation; }
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_IRasterizer.h 2012-07-30 05:53:26 UTC (rev 49376)
@@ -449,8 +449,8 @@
RAS_SAMPLER_2D,
};
virtual void RenderFilters(RAS_ICanvas* canvas)=0;
- virtual void EnableUniform(int pass, STR_String& name, RAS_UNIFORM_TYPE type, void *data)=0;
- virtual void EnableFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text)=0;
+ virtual void EnableUniform(int pass, STR_String name, RAS_UNIFORM_TYPE type, void *data)=0;
+ virtual void EnableFilter(void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text)=0;
#ifdef WITH_CXX_GUARDEDALLOC
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp 2012-07-30 05:53:26 UTC (rev 49376)
@@ -181,7 +181,7 @@
return 0;
}
-void RAS_OGLFilterManager::AnalyseShader(int passindex, vector<STR_String>& propNames)
+void RAS_OGLFilterManager::AnalyseShader(int passindex, vector<STR_String> propNames)
{
FilterUniform uniform;
texflag[passindex] = 0;
@@ -574,13 +574,13 @@
glPopMatrix();
}
-void RAS_OGLFilterManager::UpdateUniform(int pass, STR_String& name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data)
+void RAS_OGLFilterManager::UpdateUniform(int pass, STR_String name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data)
{
FilterUniform uni = {name, -1, type, data};
m_uniforms[pass][name] = uni;
}
-void RAS_OGLFilterManager::EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE mode, int pass, STR_String& text)
+void RAS_OGLFilterManager::EnableFilter(void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE mode, int pass, STR_String& text)
{
if (!isshadersupported)
return;
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.h
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.h 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.h 2012-07-30 05:53:26 UTC (rev 49376)
@@ -54,7 +54,7 @@
private:
unsigned int CreateShaderProgram(const char* shadersource);
unsigned int CreateShaderProgram(int filtermode);
- void AnalyseShader(int passindex, std::vector<STR_String>& propNames);
+ void AnalyseShader(int passindex, std::vector<STR_String> propNames);
void StartShaderProgram(int passindex, RAS_IRasterizer *rast);
void EndShaderProgram();
void PrintShaderErrors(unsigned int shader, const char *task, const char *code);
@@ -96,8 +96,8 @@
~RAS_OGLFilterManager();
void RenderFilters(RAS_IRasterizer *rast, RAS_ICanvas* canvas);
- void UpdateUniform(int pass, STR_String& name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data);
- void EnableFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE mode, int pass, STR_String& text);
+ void UpdateUniform(int pass, STR_String name, RAS_IRasterizer::RAS_UNIFORM_TYPE type, void *data);
+ void EnableFilter(void* gameObj, RAS_IRasterizer::RAS_2DFILTER_MODE mode, int pass, STR_String& text);
#ifdef WITH_CXX_GUARDEDALLOC
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp 2012-07-30 05:53:26 UTC (rev 49376)
@@ -1353,11 +1353,11 @@
m_filtermanager.RenderFilters(this, canvas);
}
-void RAS_OpenGLRasterizer::EnableUniform(int pass, STR_String& name, RAS_UNIFORM_TYPE type, void *data)
+void RAS_OpenGLRasterizer::EnableUniform(int pass, STR_String name, RAS_UNIFORM_TYPE type, void *data)
{
m_filtermanager.UpdateUniform(pass, name, type, data);
}
-void RAS_OpenGLRasterizer::EnableFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text)
+void RAS_OpenGLRasterizer::EnableFilter(void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text)
{
- m_filtermanager.EnableFilter(propNames, gameObj, mode, pass, text);
+ m_filtermanager.EnableFilter(gameObj, mode, pass, text);
}
\ No newline at end of file
Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h 2012-07-30 04:00:19 UTC (rev 49375)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h 2012-07-30 05:53:26 UTC (rev 49376)
@@ -327,8 +327,8 @@
/* 2D Filters */
virtual void RenderFilters(RAS_ICanvas* canvas);
- virtual void EnableUniform(int pass, STR_String& name, RAS_UNIFORM_TYPE type, void *data);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list