UPBGE: Use pimpl idiom for RAS_OpenGLRasterizer.

Previously all the function in RAS_IRasterizer were virtual pure functions overrided in RAS_OpenGlRasterizer. This was because some of the functions definition were using OpenGL calls. An alternative is to use an implemnt an interface. But this interface must be not included by all the includer of RAS_IRasterizer. To do so we must use a pointer to the interface. The interface is the previous RAS_OpenGLRasterizer, it is instantiated from the RAS_Irasterizer constructor into a std::unique_ptr which delete it automatically in the destructor. Function using OpenGL call like Enable(…) and Disable(…) are forwarded to interface instance. This mechanism is called the pimpl idom. The pimpl idiom avoid the virtual calls and then the multiple declaration. In the same time a little optimization is noticed of 4% (1/2ms less of 31ms).
UPBGE · Feb 1, 2017 · 849d065 · 849d065
1 parent aa4b6a0
commit 849d065
Show file tree

Hide file tree

Showing 14 changed files with 2,182 additions and 1,924 deletions.
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
@@ -632,8 +632,8 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		extern_recastnavigation
 		ge_logic
 		ge_device
-		ge_oglrasterizer
 		ge_rasterizer
+		ge_oglrasterizer
 		ge_common
 		ge_logic_expressions
 		ge_scenegraph

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
@@ -127,8 +127,8 @@ endif()
 		ge_phys_dummy
 		ge_logic
 		ge_device
-		ge_oglrasterizer
 		ge_rasterizer
+		ge_oglrasterizer
 		ge_logic_expressions
 		ge_common
 		ge_scenegraph

diff --git a/source/gameengine/Launcher/CMakeLists.txt b/source/gameengine/Launcher/CMakeLists.txt
@@ -36,7 +36,6 @@ set(INC
 	../Ketsji/KXNetwork
 	../Rasterizer
 	../Rasterizer/Node
-	../Rasterizer/RAS_OpenGLRasterizer
 	../SceneGraph
 	../VideoTexture
 	../../blender/blenkernel

diff --git a/source/gameengine/Launcher/LA_Launcher.cpp b/source/gameengine/Launcher/LA_Launcher.cpp
@@ -33,7 +33,6 @@
 #include "LA_SystemCommandLine.h"
 
 #include "RAS_ICanvas.h"
-#include "RAS_OpenGLRasterizer.h"
 
 #include "GPG_Canvas.h"
 
@@ -160,7 +159,7 @@ void LA_Launcher::InitEngine()
 	}
 	m_pythonConsole.use = (gm->flag & GAME_PYTHON_CONSOLE);
 
-	m_rasterizer = new RAS_OpenGLRasterizer();
+	m_rasterizer = new RAS_IRasterizer();
 
 	// Stereo parameters - Eye Separation from the UI - stereomode from the command-line/UI
 	m_rasterizer->SetStereoMode(m_stereoMode);

diff --git a/source/gameengine/Launcher/LA_Launcher.h b/source/gameengine/Launcher/LA_Launcher.h
@@ -41,7 +41,6 @@ class KX_ISystem;
 class KX_ISceneConverter;
 class KX_NetworkMessageManager;
 class RAS_ICanvas;
-class RAS_IRasterizer;
 class DEV_EventConsumer;
 class DEV_InputDevice;
 class GHOST_ISystem;

diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -26,12 +26,15 @@
 set(INC
 	.
 	Node
+	RAS_OpenGLRasterizer
 	../Common
 	../Expressions
 	../Ketsji
+	../Physics/Common
 	../SceneGraph
 	../GameLogic
 	../../blender/makesdna
+	../../blender/blenfont
 	../../blender/blenlib
 	../../blender/blenkernel
 	../../blender/gpu
@@ -64,6 +67,7 @@ set(SRC
 	RAS_IBatchDisplayArray.cpp
 	RAS_InstancingBuffer.cpp
 	RAS_IPolygonMaterial.cpp
+	RAS_IRasterizer.cpp
 	RAS_ITexVert.cpp
 	RAS_MaterialBucket.cpp
 	RAS_MeshObject.cpp