Merge pull request #14 from dclamage/openarl-latest

Merged changes from Openarl's latest codebase that he provided.

Author: dclamage

SimpleGraphic.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.960
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleGraphic", "SimpleGraphic.vcxproj", "{62A6B2C3-84CC-49CC-BAD7-DD0A4BFE05CB}"
 EndProject

engine/core.h

@@ -0,0 +1,15 @@
+// SimpleGraphic Engine
+// (c) David Gowor, 2014
+//
+// Core Global Header
+//
+
+// =======
+// Headers
+// =======
+
+#include "core/core_config.h"
+#include "core/core_video.h"
+
+#include "core/core_main.h"
+

engine/core/core_main.cpp

@@ -6,11 +6,7 @@
 
 #include "common.h"
 #include "system.h"
-
-#include "core_config.h"
-#include "core_video.h"
-
-#include "core_main.h"
+#include "core.h"
 
 #include "ui.h"
 
@@ -32,8 +28,6 @@ class core_main_c: public core_IMain {
 
 	sys_IMain*		sys = nullptr;
 
-	core_IConfig*	config = nullptr;
-	core_IVideo*	video = nullptr;
 	ui_IMain*		ui = nullptr;
 
 	bool			initialised = false;
@@ -63,26 +57,22 @@ void core_main_c::Init(int argc, char** argv)
 {
 	// Initialise config system
 	config = core_IConfig::GetHandle(sys);
+	video = core_IVideo::GetHandle(sys);
 
 	// Initialise UI Manager
-	ui = ui_IMain::GetHandle(sys, config);
+	ui = ui_IMain::GetHandle(sys, this);
 	ui->Init(argc, argv);
 	sys->con->ExecCommands(true);
 
 	// Hide the sysconsole
 	sys->conWin->SetVisible(false);
-
-	// Initialise video
-	video = core_IVideo::GetHandle(sys);
-	video->Apply();
+	sys->video->SetForeground();
 
 	initialised = true;
 }
 
 void core_main_c::Frame()
 {
-	// sys->con->Printf("Messages...\n");
-
 	// Execute commands
 	sys->con->ExecCommands();
 
@@ -94,16 +84,12 @@ void core_main_c::Shutdown()
 {	
 	initialised = false;
 
-	// Shutdown video
-	sys->video->SetVisible(false);
-	video->Save();
-	core_IVideo::FreeHandle(video);
-
 	// Shutdown UI Manager
 	ui->Shutdown();
 	ui_IMain::FreeHandle(ui);
 
 	// Shutdown config system
+	core_IVideo::FreeHandle(video);
 	core_IConfig::FreeHandle(config);
 
 	sys->con->Printf("Engine shutdown complete.\n");

engine/core/core_main.h

@@ -14,6 +14,9 @@ class core_IMain {
 	static core_IMain* GetHandle(sys_IMain* sysHnd);
 	static void FreeHandle(core_IMain* hnd);
 
+	core_IConfig*	config = nullptr;
+	core_IVideo*	video = nullptr;
+
 	virtual void	Init(int argc, char** argv) = 0;
 	virtual void	Frame() = 0;
 	virtual void	Shutdown() = 0;

engine/render.h

@@ -33,6 +33,13 @@ enum r_texFlag_e {
 	TF_ASYNC	= 0x08	// Asynchronous loading
 };
 
+// Blend modes
+enum r_blendMode_e {
+	RB_ALPHA,
+	RB_PRE_ALPHA,
+	RB_ADDITIVE
+};
+
 // Shader handle
 class r_shaderHnd_c {
 	friend class r_renderer_c;
@@ -71,6 +78,7 @@ class r_IRenderer {
 	virtual void	SetDrawSubLayer(int subLayer) = 0;
 	virtual int		GetDrawLayer() = 0;
 	virtual void	SetViewport(int x = 0, int y = 0, int width = 0, int height = 0) = 0;
+	virtual void	SetBlendMode(int mode) = 0;
 	virtual void	DrawColor(const col4_t col = NULL) = 0;
 	virtual void	DrawColor(dword col) = 0;
 	virtual void	DrawImage(r_shaderHnd_c* hnd, float x, float y, float w, float h, float s1 = 0.0f, float t1 = 0.0f, float s2 = 1.0f, float t2 = 1.0f) = 0;

engine/render/r_main.cpp

@@ -93,14 +93,15 @@ r_shaderHnd_c::~r_shaderHnd_c()
 struct r_layerCmd_s {
 	enum {
 		VIEWPORT,
+		BLEND,
 		BIND,
 		COLOR,
 		QUAD,
 	} cmd;
 	union {
 		r_viewport_s viewport;
+		int blendMode;
 		r_tex_c* tex;
-		GLenum mode;
 		col4_t col;
 		struct {
 			double s[4];
@@ -150,6 +151,13 @@ void r_layer_c::SetViewport(r_viewport_s* viewport)
 	cmd->viewport.height = viewport->height;
 }
 
+void r_layer_c::SetBlendMode(int mode)
+{
+	r_layerCmd_s* cmd = NewCommand();
+	cmd->cmd = r_layerCmd_s::BLEND;
+	cmd->blendMode = mode;
+}
+
 void r_layer_c::Bind(r_tex_c* tex)
 {
 	r_layerCmd_s* cmd = NewCommand();
@@ -177,6 +185,7 @@ void r_layer_c::Quad(double s0, double t0, double x0, double y0, double s1, doub
 void r_layer_c::Render()
 {
 	r_viewport_s curViewPort = {-1, -1, -1, -1};
+	int curBlendMode = -1;
 	r_tex_c* curTex = NULL;
 	for (int i = 0; i < numCmd; i++) {
 		r_layerCmd_s* cmd = cmdList[i];
@@ -191,6 +200,21 @@ void r_layer_c::Render()
 				glLoadIdentity();
 			}
 			break;
+		case r_layerCmd_s::BLEND:
+			if (cmd->blendMode != curBlendMode) {
+				switch (cmd->blendMode) {
+				case RB_ALPHA:
+					glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+					break;
+				case RB_PRE_ALPHA:
+					glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+					break;
+				case RB_ADDITIVE:
+					glBlendFunc(GL_ONE, GL_ONE);
+					break;
+				}
+			}
+			break;
 		case r_layerCmd_s::BIND:
 			if (cmd->tex != curTex) {
 				cmd->tex->Bind();
@@ -278,7 +302,6 @@ void r_renderer_c::Init()
 	glEnable(GL_TEXTURE_2D);
 	glDisable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 	// Load extensions
 	sys->con->Printf("Loading OpenGL extensions...\n");
@@ -372,11 +395,12 @@ void r_renderer_c::Shutdown()
 
 void r_renderer_c::BeginFrame()
 {
-	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
 	curLayer = layerList[0];
 
 	SetViewport();
+	SetBlendMode(RB_ALPHA);
 	DrawColor();
 }
 
@@ -585,6 +609,7 @@ void r_renderer_c::SetDrawLayer(int layer, int subLayer)
 	}
 	curLayer = newCurLayer;
 	curLayer->SetViewport(&curViewport);
+	curLayer->SetBlendMode(curBlendMode);
 }
 
 void r_renderer_c::SetDrawSubLayer(int subLayer)
@@ -610,6 +635,12 @@ void r_renderer_c::SetViewport(int x, int y, int width, int height)
 	curLayer->SetViewport(&curViewport);
 }
 
+void r_renderer_c::SetBlendMode(int mode)
+{
+	curBlendMode = mode;
+	curLayer->SetBlendMode(mode);
+}
+
 void r_renderer_c::DrawColor(const col4_t col)
 {
 	if (col) {

engine/render/r_main.h

@@ -36,6 +36,7 @@ class r_layer_c {
 	~r_layer_c();
 
 	void	SetViewport(r_viewport_s* viewport);
+	void	SetBlendMode(int mode);
 	void	Bind(r_tex_c* tex);
 	void	Color(col4_t col);
 	void	Quad(double s0, double t0, double x0, double y0, double s1, double t1, double x1, double y1, double s2, double t2, double x2, double y2, double s3, double t3, double x3, double y3);
@@ -69,6 +70,7 @@ class r_renderer_c: public r_IRenderer, public conCmdHandler_c {
 	void	SetDrawSubLayer(int subLayer);
 	int		GetDrawLayer();
 	void	SetViewport(int x = 0, int y = 0, int width = 0, int height = 0);
+	void	SetBlendMode(int mode);
 	void	DrawColor(const col4_t col = NULL);
 	void	DrawColor(dword col);
 	void	DrawImage(r_shaderHnd_c* hnd, float x, float y, float w, float h, float s1 = 0.0f, float t1 = 0.0f, float s2 = 1.0f, float t2 = 1.0f);
@@ -108,6 +110,7 @@ class r_renderer_c: public r_IRenderer, public conCmdHandler_c {
 	col4_t	drawColor = {};		// Current draw color
 
 	r_viewport_s curViewport; // Current viewport
+	int		curBlendMode = 0;	// Current blend mode
 
 	int		numShader = 0;
 	class r_shader_c *shaderList[R_MAXSHADERS] = {};

engine/system/sys_console.h

@@ -14,7 +14,8 @@ class sys_IConsole {
 	static sys_IConsole* GetHandle(class sys_IMain* sysHnd);
 	static void FreeHandle(sys_IConsole* hnd);
 
-	virtual	void	SetVisible( bool show ) = 0;	// Set window state
+	virtual	void	SetVisible(bool show) = 0;	// Set window state
 	virtual	bool	IsVisible() = 0;				// Get window state
+	virtual void	SetForeground() = 0; // Bring window to foreground if shown
 	virtual void	SetTitle(const char* title) = 0; // Set window title
 };

engine/system/sys_video.h

@@ -50,6 +50,7 @@ class sys_IVideo {
 	virtual	int		Apply(sys_vidSet_s* set) = 0;	// Apply settings
 
 	virtual	void	SetActive(bool active) = 0;		// Respond to window activated status change
+	virtual void	SetForeground() = 0; // Activate the window if shown
 	virtual bool	IsActive() = 0; // Get activated status
 	virtual void	SizeChanged(int width, int height, bool max) = 0; // Respond to window size change
 	virtual void	PosChanged(int x, int y) = 0; // Respond to window position change

engine/system/win/sys_console.cpp

@@ -25,6 +25,7 @@ class sys_console_c: public sys_IConsole, public conPrintHook_c, public thread_c
 	// Interface
 	void	SetVisible(bool show);
 	bool	IsVisible();
+	void	SetForeground();
 	void	SetTitle(const char* title);
 
 	// Encapsulated
@@ -223,6 +224,13 @@ void sys_console_c::SetVisible(bool show)
 	}
 }
 
+void sys_console_c::SetForeground()
+{
+	if (shown) {
+		SetForegroundWindow(hwMain);
+	}
+}
+
 bool sys_console_c::IsVisible()
 {
 	return IsWindowVisible(hwMain);