Mac: Fix mac compability with OpenGL, glew, glm and ENet.

Updated glm.

Author: FlayaN

EntityPlayer.cpp

@@ -96,15 +96,15 @@ void EntityPlayer::update(float delta, const Uint8* keyCode)
 	if(keyCode[SDL_SCANCODE_D])
 		velocity.x += acceleration;
 
-	if(std::abs(velocity.x) > maxSpeed)
+	if(abs(velocity.x) > maxSpeed)
 	{
 		if(velocity.x > 0)
 			velocity.x = maxSpeed;
 		else if(velocity.x < 0)
 			velocity.x = -maxSpeed;
 	}
 
-	if(std::abs(velocity.y) > maxSpeed)
+	if(abs(velocity.y) > maxSpeed)
 	{
 		if(velocity.y > 0)
 			velocity.y = maxSpeed;
@@ -140,15 +140,15 @@ void EntityPlayer::update(float delta, const Uint8* keyCode)
 
 void EntityPlayer::update2(float delta)
 {
-	if(std::abs(velocity.x) > maxSpeed)
+	if(abs(velocity.x) > maxSpeed)
 	{
 		if(velocity.x > 0)
 			velocity.x = maxSpeed;
 		else if(velocity.x < 0)
 			velocity.x = -maxSpeed;
 	}
 
-	if(std::abs(velocity.y) > maxSpeed)
+	if(abs(velocity.y) > maxSpeed)
 	{
 		if(velocity.y > 0)
 			velocity.y = maxSpeed;

GL_utilities.h

@@ -5,7 +5,12 @@
 extern "C" {
 #endif
 
-#include <GL/glew.h>
+#ifdef __APPLE__
+    #include "glew.h"
+    #include <OpenGL/gl3.h>
+#else
+    #include <GL/glew.h>
+#endif
 
 void printError(const char *functionName);
 GLuint loadShaders(const char *vertFileName, const char *fragFileName);

Game.cpp

@@ -227,26 +227,11 @@ void Game::loadJson(void)
 
 void Game::loadSettings(void)
 {
-	std::string settingsChunkPath = "../assets/config/settings/chunk.json";
-	std::string settingsEnginePath = "../assets/config/settings/engine.json";
-	std::string settingsGraphicPath = "../assets/config/settings/graphic.json";
-	std::string settingsPlayerPath = "../assets/config/settings/player.json";
-	std::string settingsTilePath = "../assets/config/settings/tile.json";
-#ifdef __APPLE__
-    CFBundleRef mainBundle = CFBundleGetMainBundle();
-    CFURLRef resourceURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
-    char p[PATH_MAX];
-    if(!CFURLGetFileSystemRepresentation(resourceURL, TRUE, (UInt8 *)p, PATH_MAX))
-        std::cout << "ERROROROROR" << std::endl;
-    CFRelease(resourceURL);
-    
-    chdir(p);
-    
-    std::string path = p;
-    
-    std::string texturePath = path + "/" + texturePath;
-	std::string playerPath = path + "/" + playerPath;
-#endif
+	std::string settingsEnginePath = Utility::getBasePath() + "assets/config/settings/engine.json";
+	std::string settingsGraphicPath = Utility::getBasePath() + "assets/config/settings/graphic.json";
+	std::string settingsPlayerPath = Utility::getBasePath() + "assets/config/settings/player.json";
+	std::string settingsTilePath = Utility::getBasePath() + "assets/config/settings/tile.json";
+
 	rapidjson::Document doc;
 	std::cout << "--------------------Loading Settings--------------------" << std::endl;
 	std::cout << "----------Loading engine.json----------" << std::endl;
@@ -295,7 +280,7 @@ void Game::loadSettings(void)
 	playerType.size = glm::vec2(doc["size"]["width"].GetInt(), doc["size"]["height"].GetInt());
 
 	assert(doc["texture"].IsString());
-	playerType.texture = std::string("../assets/config/settings/")+doc["texture"].GetString();
+	playerType.texture = std::string("assets/config/settings/")+doc["texture"].GetString();
 
 	assert(doc["acceleration"].IsDouble());
 	playerType.acceleration = (float)doc["acceleration"].GetDouble();
@@ -324,7 +309,7 @@ void Game::loadSettings(void)
 
 void Game::loadTiles(void)
 {
-	std::string path = "../assets/config/tiles/";
+	std::string path = Utility::getBasePath() + "assets/config/tiles/";
 
 	DIR* dir;
 	struct dirent* ent;
@@ -368,10 +353,10 @@ void Game::loadTiles(void)
 
 void Game::loadItems(void)
 {
-	std::string clothingPath = "../assets/config/items/clothing/";
-	std::string consumablesPath = "../assets/config/items/consumables/";
-	std::string materialPath = "../assets/config/items/materials/";
-	std::string weaponPath = "../assets/config/items/weapons/";
+	std::string clothingPath = Utility::getBasePath() + "assets/config/items/clothing/";
+	std::string consumablesPath = Utility::getBasePath() + "assets/config/items/consumables/";
+	std::string materialPath = Utility::getBasePath() + "assets/config/items/materials/";
+	std::string weaponPath = Utility::getBasePath() + "assets/config/items/weapons/";
 
 	DIR* dir;
 	struct dirent* ent;

Game.h

@@ -3,8 +3,10 @@
 
 #ifdef __APPLE__
 	#include <SDL2_mixer/SDL_mixer.h>
+    #include <dirent.h>
 #else
 	#include "SDL_mixer.h"
+    #include "dirent.h"
 #endif
 
 #include <cstdio>
@@ -14,7 +16,7 @@
 #include <iostream>
 #include <memory>
 
-#include "dirent.h"
+
 #include "lib/rapidjson/document.h"
 #include "lib/rapidjson/filestream.h"
 
@@ -37,6 +39,7 @@
 #include "TypeMaterial.h"
 #include "TypeWeapon.h"
 #include "Chat.h"
+#include "Utility.h"
 
 class Game
 {

Graphics.cpp

@@ -2,23 +2,23 @@
 
 Graphics::Graphics(void)
 {
-
-	//SDL_CreateWindowAndRenderer(800, 600, SDL_WINDOW_OPENGL, &win, &renderer);
-
-
-	win = SDL_CreateWindow("Project Z", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, Settings::Graphics::screenWidth, Settings::Graphics::screenHeight, SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL);	// create window
-	renderer = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-		
-	context = SDL_GL_CreateContext(win);
-	SDL_GL_MakeCurrent(win, context);
-
-	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);	// specify OpenGL version
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);	// specify OpenGL version
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);	// 3.2
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 	SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
 
+	win = SDL_CreateWindow("Project Z", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, Settings::Graphics::screenWidth, Settings::Graphics::screenHeight, SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL);	// create window
+	renderer = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+		
+	
+	
+
+	
+    
+    
+
 	SDL_GL_SetSwapInterval(1);	// Vsync
 
 	glewExperimental = GL_TRUE;
@@ -30,8 +30,10 @@ Graphics::Graphics(void)
 	std::cout << "Using GLEW: " << glewGetString(GLEW_VERSION) << std::endl;
 	std::cout << "Using OpenGL: " << (char*)glGetString(GL_VERSION) << std::endl;
 
-	//glViewport(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
-
+    
+    context = SDL_GL_CreateContext(win);
+    SDL_GL_MakeCurrent(win, context);
+    
 	printError("Graphics|Graphics");
 }
 

ModelSquare.cpp

@@ -2,6 +2,8 @@
 
 ModelSquare::ModelSquare(std::string vert, std::string frag)
 {
+    vert = Utility::getBasePath() + vert;
+    frag = Utility::getBasePath() + frag;
 	prog = loadShaders(vert.c_str(), frag.c_str());
 	glGenVertexArrays(1, &vertexArrayObj);
 

ModelSquare.h

@@ -10,6 +10,7 @@
 
 #include "GL_utilities.h"
 #include "Defines.h"
+#include "Utility.h"
 
 enum class BUFFTYPE
 {

Network.cpp

@@ -28,7 +28,7 @@ Network::Network(const char* ipChar)
 
 	ENetEvent event;
 
-	if(enet_host_service(client, &event, 5000) > 0 && event.type == ENET_EVENT_TYPE_CONNECT)
+	if(enet_host_service(client, &event, 1000) > 0 && event.type == ENET_EVENT_TYPE_CONNECT)
 	{
 		std::cout << "Successfully connected to server" << std::endl;
 		success = true;