Merge branch 'master' of warmcat.org:/home/git-repo/GameLab

# Conflicts:
#	Projects/VisualStudio/Editor/Editor.vcxproj
#	Projects/VisualStudio/Editor/Editor.vcxproj.filters

1 files changed, 0 insertions, 43 deletions

diff --git a/Editor/main.cpp b/Editor/main.cpp
deleted file mode 100644
index 58e5f04..0000000
--- a/Editor/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-extern "C" {
-#include "wog.h"
-}
-
-#include <glad/glad.h>
-#include <windows.h>
-
-wog_Window * wnd ;
-
-void* proc(const char *name) {
-	return wglGetProcAddress(name);
-}
-
-int main(int argc, char* argv[]) {
-	wnd = wog_createWindow("GameLab" , 800, 600, 500, 500, 0);
-	wog_show(wnd);
-
-	wog_GLContext* ctx = wog_createGLContext(wnd);
-	wog_makeCurrent(wnd, ctx);
-
-	//gladLoadGLLoader(proc);
-	int load = gladLoadGL();
-
-//	wog_makeCurrent(wnd, ctx);
-
-	while (true) {
-		wog_Event e;
-		while (wog_pollEvent(wnd, &e)) {
-			if (e.type == WOG_ECLOSE)
-				goto quit;
-		}
-		//glViewport(0, 0, 500, 500);
-		glClearColor(0.16, 0.16, 0.16, 1);
-		glClear(GL_COLOR_BUFFER_BIT);
-		glFlush();
-
-		wog_swapBuffers(wnd);
-	}
-
-quit:
-
-	return 0;
-}