rosethorn/frostbite
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

(Used Razzy's credentials by accident the first time) Fix includes

Browse source 
remove/change Windows-specific code so TestApp can compile on other platforms
This commit is contained in:
Rose 2023-10-23 17:55:23 +13:00
parent 19fa0ab849
commit eda2b5b1d5
Signed by: rosethorn
GPG key ID: DF8939388907D1F7
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CuttownTest/infoPanel.cpp
View file

@ -1,4 +1,4 @@
#include "InfoPanel.h" #include "infoPanel.h"
#include "gameData.h" #include "gameData.h"
#include <QtWidgets> #include <QtWidgets>

2
CuttownTest/mainWindow.cpp
View file

@ -1,7 +1,7 @@
#include <QtWidgets> #include <QtWidgets>
#include "mainWindow.h" #include "mainWindow.h"
#include "InfoPanel.h" #include "infoPanel.h"
MainWindow::MainWindow(GameData& gameDataIn) MainWindow::MainWindow(GameData& gameDataIn)
: textEdit(new QTextEdit), gameData(gameDataIn) : textEdit(new QTextEdit), gameData(gameDataIn)

10
TestApp/Main.cpp
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "SDL.h"
#include <SDL.h>
#include "ModelWindow.h" #include "ModelWindow.h"
#include "windows.h"
#include "LmpRepository.h" #include "LmpRepository.h"
#include "GobFile.h" #include "GobFile.h"
#include "VifDecoder.h" #include "VifDecoder.h"
@ -54,7 +54,7 @@ Model* readModel(string dataPath, const char* lmpName, vector<string> meshNames,
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
string dataPath = "D:\\emu\\bgda\\BG\\DATA\\"; string dataPath = "";
if (argc == 2){ if (argc == 2){
dataPath = argv[1]; dataPath = argv[1];
} }
@ -102,9 +102,7 @@ int main(int argc, char **argv) {
if ( deltaclock != 0 ){ if ( deltaclock != 0 ){
unsigned int currentFPS = 1000 / deltaclock; unsigned int currentFPS = 1000 / deltaclock;
char fpsString[64]; fprintf(stderr, "FPS: %d\n", currentFPS);
sprintf(fpsString, "FPS: %d\n", currentFPS);
OutputDebugStringA(fpsString);
} }
} }

4
snowlib/LmpFile.cpp
View file

@ -1,3 +1,5 @@
#include <cstring>
#include "LmpFile.h" #include "LmpFile.h"
#include "DataAccess.h" #include "DataAccess.h"
#include "Helpers.h" #include "Helpers.h"
@ -68,4 +70,4 @@ std::vector<std::string> LmpFile::findFilenamesByExtension(const char* extension
} }
} }
return foundFilenames; return foundFilenames;
} }

2
snowlib/VifDecoder.cpp
View file

@ -1,3 +1,5 @@
#include <cstring>
#include "VifDecoder.h" #include "VifDecoder.h"
#include "DataUtil.h" #include "DataUtil.h"
#include "GIFTag.h" #include "GIFTag.h"