eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

Merge branch 'master' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-09-20 19:14:28 +02:00
parent 0453e10534 d9687a4e1f
commit 7c6501bb07
114 changed files with 9353 additions and 6114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdafx.h
View File

@@ -35,6 +35,7 @@
// stl
#include <cstddef>
#include <cstdlib>
#include <cstdio>
#include <cassert>
#include <cstdint>
#include <iostream>
@@ -85,10 +86,7 @@
#include "GL/wglew.h"
#endif
#define GLFW_INCLUDE_GLU
#ifndef __ANDROID__
#include <GLFW/glfw3.h>
#endif
#define GLM_ENABLE_EXPERIMENTAL
#define GLM_FORCE_CTOR_INIT
@@ -105,6 +103,16 @@
#define STRINGIZE_DETAIL(x) #x
#define STRINGIZE(x) STRINGIZE_DETAIL(x)
#define glDebug(x) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#ifdef DBG_NEW
#pragma push_macro("new")
#undef new
#include "imgui/imgui.h"
#pragma pop_macro("new")
#else
#include "imgui/imgui.h"
#endif
#endif
#ifdef DBG_NEW