Remove OpenGL 2.1 code from the project

pioneerspacesim · Sep 16, 2018 · 026ae2d · 026ae2d
1 parent 225c6e8
commit 026ae2d
Show file tree

Hide file tree

Showing 58 changed files with 20 additions and 5,468 deletions.
diff --git a/contrib/imgui/Makefile.am b/contrib/imgui/Makefile.am
@@ -5,5 +5,5 @@ AM_CFLAGS += $(SDL2_CFLAGS)
 
 AM_CPPFLAGS += -DIMGUI_IMPL_OPENGL_LOADER_GLEW=1 -I$(top_srcdir)/contrib/imgui -I$(top_srcdr)/contrib/glew -I$(top_srcdir)/contrib/imgui/examples/ -std=c++11
 noinst_LIBRARIES = libimgui.a
-libimgui_a_SOURCES = imgui.cpp imgui_draw.cpp imgui_widgets.cpp imgui_demo.cpp examples/imgui_impl_opengl3.cpp examples/imgui_impl_opengl2.cpp examples/imgui_impl_sdl.cpp
+libimgui_a_SOURCES = imgui.cpp imgui_draw.cpp imgui_widgets.cpp imgui_demo.cpp examples/imgui_impl_opengl3.cpp examples/imgui_impl_sdl.cpp
 noinst_HEADERS = imgui.h examples/imgui_impl_opengl3.h examples/imgui_impl_opengl3.h examples/imgui_impl_sdl.h
diff --git a/contrib/imgui/examples/imgui_impl_opengl2.cpp b/contrib/imgui/examples/imgui_impl_opengl2.cpp
diff --git a/contrib/imgui/examples/imgui_impl_opengl2.h b/contrib/imgui/examples/imgui_impl_opengl2.h
diff --git a/src/CityOnPlanet.cpp b/src/CityOnPlanet.cpp
@@ -381,22 +381,10 @@ void CityOnPlanet::Render(Graphics::Renderer *r, const Graphics::Frustum &frustu
 		++uCount;
 	}
 
-	if(r->SupportsInstancing())
-	{
-		// render the building models using instancing
-		for(Uint32 i=0; i<s_buildingList.numBuildings; i++) {
-			if(!transform[i].empty())
-				s_buildingList.buildings[i].resolvedModel->Render(transform[i]);
-		}
-	}
-	else
-	{
-		// render the buildings individually
-		for(Uint32 i=0; i<s_buildingList.numBuildings; i++) {
-			for(auto t : transform[i]) {
-				s_buildingList.buildings[i].resolvedModel->Render(t);
-			}
-		}
+	// render the building models using instancing
+	for(Uint32 i=0; i<s_buildingList.numBuildings; i++) {
+		if(!transform[i].empty())
+			s_buildingList.buildings[i].resolvedModel->Render(transform[i]);
 	}
 
 	r->GetStats().AddToStatCount(Graphics::Stats::STAT_BUILDINGS, uCount);

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -313,7 +313,6 @@ pioneer_LDADD = \
 	gui/libgui.a \
 	graphics/libgraphics.a \
 	graphics/opengl/libgraphicsopengl.a \
-	graphics/gl2/libgraphicsgl2.a \
 	galaxy/libgalaxy.a \
 	scenegraph/libscenegraph.a \
 	text/libtext.a \
@@ -404,7 +403,6 @@ uitest_LDADD = \
 	text/libtext.a \
 	graphics/libgraphics.a \
 	graphics/opengl/libgraphicsopengl.a \
-	graphics/gl2/libgraphicsgl2.a \
 	posix/libposix.a \
 	../contrib/jenkins/libjenkins.a \
 	../contrib/PicoDDS/libpicodds.a \

diff --git a/src/ModelViewer.cpp b/src/ModelViewer.cpp
@@ -3,7 +3,6 @@
 
 #include "ModelViewer.h"
 #include "FileSystem.h"
-#include "graphics/gl2/GL2Renderer.h"
 #include "graphics/opengl/RendererGL.h"
 #include "graphics/Graphics.h"
 #include "graphics/Light.h"
@@ -148,20 +147,15 @@ void ModelViewer::Run(const std::string &modelName)
 
 	ModManager::Init();
 
-	Graphics::RendererGL2::RegisterRenderer();
 	Graphics::RendererOGL::RegisterRenderer();
 
 	// determine what renderer we should use, default to Opengl 3.x
 	const std::string rendererName = config->String("RendererName", Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x));
 	Graphics::RendererType rType = Graphics::RENDERER_OPENGL_3x;
-	if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_21))
-	{
-		rType = Graphics::RENDERER_OPENGL_21;
-	}
-	else if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x))
-	{
-		rType = Graphics::RENDERER_OPENGL_3x;
-	}
+	//if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x))
+	//{
+	//	rType = Graphics::RENDERER_OPENGL_3x;
+	//}
 
 	//video
 	Graphics::Settings videoSettings = {};

diff --git a/src/Pi.cpp b/src/Pi.cpp
@@ -74,7 +74,6 @@
 #include "galaxy/StarSystem.h"
 #include "gameui/Lua.h"
 // ------------------------------------------------------------
-#include "graphics/gl2/GL2Renderer.h"
 #include "graphics/opengl/RendererGL.h"
 // ------------------------------------------------------------
 #include "graphics/Graphics.h"
@@ -473,20 +472,15 @@ void Pi::Init(const std::map<std::string,std::string> &options, bool no_gui)
 
 	OutputVersioningInfo();
 
-	Graphics::RendererGL2::RegisterRenderer();
 	Graphics::RendererOGL::RegisterRenderer();
 
 	// determine what renderer we should use, default to Opengl 3.x
 	const std::string rendererName = config->String("RendererName", Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x));
 	Graphics::RendererType rType = Graphics::RENDERER_OPENGL_3x;
-	if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_21))
-	{
-		rType = Graphics::RENDERER_OPENGL_21;
-	}
-	else if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x))
-	{
-		rType = Graphics::RENDERER_OPENGL_3x;
-	}
+	//if(rendererName == Graphics::RendererNameFromType(Graphics::RENDERER_OPENGL_3x))
+	//{
+	//	rType = Graphics::RENDERER_OPENGL_3x;
+	//}
 
 	// Do rest of SDL video initialization and create Renderer
 	Graphics::Settings videoSettings = {};