diff --git a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h index 224f75661..74ffcdcf0 100644 --- a/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h @@ -3,7 +3,6 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" #include "app/common/src/DLC/DLCPack.h" -#include "app/include/stdafx.h" class DLCPack; diff --git a/targets/app/include/stdafx.h b/targets/app/include/stdafx.h deleted file mode 100644 index a7192dee5..000000000 --- a/targets/app/include/stdafx.h +++ /dev/null @@ -1,21 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#ifdef _WINDOWS64 -#include "app/common/src/Audio/SoundEngine.h" -#include "app/windows/Iggy/gdraw/gdraw_d3d11.h" -#include "app/windows/Iggy/include/iggy.h" -#include "app/windows/Windows64_App.h" -#include "app/windows/Windows64_UIController.h" -#include "app/windows/XML/ATGXmlParser.h" -#else -#include "app/common/src/Audio/SoundEngine.h" -#include "app/linux/Iggy/include/iggy.h" -#include "app/linux/Linux_App.h" -#include "app/linux/Linux_UIController.h" -#include "app/linux/Stubs/LinuxStubs.h" -#endif diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp index ded658065..8963c1cfd 100644 --- a/targets/minecraft/client/Camera.cpp +++ b/targets/minecraft/client/Camera.cpp @@ -54,16 +54,17 @@ zPlayerOffs = position->get(2); // this is just working out how to get a (0,0,0) point in clip space to pass // into the inverted combined model/view/projection matrix, so we just need // to get this matrix and get its translation as an equivalent. + // 4jcraft: swapped from dxmath to glm glm::mat4 _modelview, _proj, _final, _invert; glm::vec4 trans; memcpy(&_modelview, modelview->_getDataPointer(), 64); memcpy(&_proj, projection->_getDataPointer(), 64); - _final = _proj * _modelview; // GLM is column-major; reverse multiply order + _final = _proj * _modelview; _invert = glm::inverse(_final); - trans = _invert[3]; // column 3 = translation column in column-major + trans = _invert[3]; xPlayerOffs = trans.x / trans.w; yPlayerOffs = trans.y / trans.w; diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index 13c778388..77887b98f 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -3,7 +3,6 @@ #include "AbstractTexturePack.h" #include "app/linux/Linux_App.h" -#include "app/include/stdafx.h" #include "java/InputOutputStream/InputStream.h" #include "strings.h"