eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 13:59:19 +02:00
Code Issues 123 Wiki Activity

milek7's branch merge; model file serialization, 64bit compatibility

Browse Source
This commit is contained in:
tmj-fstate
2017-03-06 18:20:26 +01:00
parent 89fe4e7f7c b65dd1a735
commit 66826994db
61 changed files with 2765 additions and 2431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Globals.h
View File

@@ -12,8 +12,8 @@ http://mozilla.org/MPL/2.0/.
#include <string>
#include <Windows.h>
#include "renderer.h"
#include "gl/glew.h"
#include "glfw/glfw3.h"
#include "gl/glew.h"
#include "dumb3d.h"
// definicje klawiszy
@@ -264,9 +264,9 @@ class Global
static double fLuminance; // jasność światła do automatycznego zapalania
static float SunAngle; // angle of the sun relative to horizon
static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji
static GLFWwindow *window;
static bool shiftState; //m7todo: brzydko
static bool ctrlState;
static GLFWwindow *window;
static bool shiftState; //m7todo: brzydko
static bool ctrlState;
static int ScreenWidth; // current window dimensions. TODO: move it to renderer
static int ScreenHeight;
static float ZoomFactor; // determines current camera zoom level. TODO: move it to the renderer