mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-04-27 11:43:37 +00:00
nuke app stdafx.h
This commit is contained in:
parent
857b3b6560
commit
2a2a9ef57f
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue