Skip to content

Commit 18e101b

Browse files
yaz0ryaz0r
committed
Cleanup and optimize build
1 parent 4df1920 commit 18e101b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+998
-12062
lines changed

‎AzelLib/3dEngine_flush.cpp‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "PDS.h"
22
#include "renderer/renderer_gl.h"
3+
#include "processModel.h"
34

45
extern std::array<sMatrix4x3, 16> matrixStack;
56

@@ -995,30 +996,33 @@ void flushObjectsToDrawList()
995996
bInit = true;
996997
}
997998

998-
if(ImGui::Begin("Objects"))
999+
if(!isShipping())
9991000
{
1000-
for (int i = 0; i < objectRenderList.size(); i++)
1001+
if (ImGui::Begin("Objects"))
10011002
{
1002-
char buffer[256];
1003+
for (int i = 0; i < objectRenderList.size(); i++)
1004+
{
1005+
char buffer[256];
10031006
sprintf(buffer, "Object %i", i);
10041007
ImGui::PushID(buffer);
1005-
{
1006-
for (int j = 0; j < 3; j++)
10071008
{
1008-
float vertex[4];
1009-
vertex[0] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 0] / (float)0x10000;
1010-
vertex[1] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 1] / (float)0x10000;
1011-
vertex[2] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 2] / (float)0x10000;
1012-
vertex[3] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 3] / (float)0x10000;
1013-
1014-
sprintf(buffer, "M%d", j);
1015-
ImGui::InputFloat4(buffer, vertex);
1009+
for (int j = 0; j < 3; j++)
1010+
{
1011+
float vertex[4];
1012+
vertex[0] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 0] / (float)0x10000;
1013+
vertex[1] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 1] / (float)0x10000;
1014+
vertex[2] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 2] / (float)0x10000;
1015+
vertex[3] = objectRenderList[i].m_modelMatrix.matrix[j * 4 + 3] / (float)0x10000;
1016+
1017+
sprintf(buffer, "M%d", j);
1018+
ImGui::InputFloat4(buffer, vertex);
1019+
}
10161020
}
1021+
ImGui::PopID();
10171022
}
1018-
ImGui::PopID();
10191023
}
1024+
ImGui::End();
10201025
}
1021-
ImGui::End();
10221026

10231027
checkGL();
10241028

‎AzelLib/CMakeLists.txt‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
2121
file(GLOB_RECURSE SRC_ROOT
2222
"*.cpp"
2323
"*.h"
24-
)
24+
)
2525

2626
set(SOURCES
2727
${SOURCES}
@@ -43,29 +43,6 @@ endfunction(assign_source_group)
4343

4444
assign_source_group(${SOURCES})
4545

46-
set(SOURCES
47-
${SOURCES}
48-
${THIRD_PARTY}/imgui/imgui.cpp
49-
${THIRD_PARTY}/imgui/imgui_draw.cpp
50-
${THIRD_PARTY}/imgui/imgui_widgets.cpp
51-
52-
${THIRD_PARTY}/aosdk/eng_ssf/m68kcpu.c
53-
${THIRD_PARTY}/aosdk/eng_ssf/m68kopac.c
54-
${THIRD_PARTY}/aosdk/eng_ssf/m68kopdm.c
55-
${THIRD_PARTY}/aosdk/eng_ssf/m68kopnz.c
56-
${THIRD_PARTY}/aosdk/eng_ssf/m68kops.c
57-
${THIRD_PARTY}/aosdk/eng_ssf/sat_hw.c
58-
${THIRD_PARTY}/aosdk/eng_ssf/scsp.c
59-
${THIRD_PARTY}/aosdk/eng_ssf/scspdsp.c
60-
#${THIRD_PARTY}/aosdk/eng_ssf/scsplfo.c
61-
)
62-
63-
if (MSVC)
64-
set(SOURCES
65-
${SOURCES}
66-
${THIRD_PARTY}/imgui/examples/libs/gl3w/GL/gl3w.c
67-
)
68-
endif()
6946

7047
if( MSVC )
7148
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SDL -std=c++0x -D_HAS_EXCEPTIONS=0 /GR-")
@@ -125,7 +102,35 @@ if(MSVC)
125102
else()
126103
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
127104
endif()
128-
105+
106+
ADD_MSVC_PRECOMPILED_HEADER("PDS.h" "PDS_Precompiled.cpp" SOURCES)
107+
108+
SET_SOURCE_FILES_PROPERTIES("PDS_Precompiled.cpp"
109+
PROPERTIES COMPILE_FLAGS "/Yc\"PDS.h\" /FI\"PDS.h\" /Fp\"PDS.pch\""
110+
OBJECT_DEPENDS "PDS.pch")
111+
if (MSVC)
112+
set(SOURCES
113+
${SOURCES}
114+
${THIRD_PARTY}/imgui/examples/libs/gl3w/GL/gl3w.c
115+
)
116+
endif()
117+
118+
set(SOURCES
119+
${SOURCES}
120+
${THIRD_PARTY}/imgui/imgui.cpp
121+
${THIRD_PARTY}/imgui/imgui_draw.cpp
122+
${THIRD_PARTY}/imgui/imgui_widgets.cpp
123+
124+
${THIRD_PARTY}/aosdk/eng_ssf/m68kcpu.c
125+
${THIRD_PARTY}/aosdk/eng_ssf/m68kopac.c
126+
${THIRD_PARTY}/aosdk/eng_ssf/m68kopdm.c
127+
${THIRD_PARTY}/aosdk/eng_ssf/m68kopnz.c
128+
${THIRD_PARTY}/aosdk/eng_ssf/m68kops.c
129+
${THIRD_PARTY}/aosdk/eng_ssf/sat_hw.c
130+
${THIRD_PARTY}/aosdk/eng_ssf/scsp.c
131+
${THIRD_PARTY}/aosdk/eng_ssf/scspdsp.c
132+
#${THIRD_PARTY}/aosdk/eng_ssf/scsplfo.c
133+
)
129134

130135
IF(${CMAKE_SYSTEM_NAME} MATCHES iOS)
131136
add_library (AzelLib-ios ${SOURCES})

‎AzelLib/LCS.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "PDS.h"
22
#include "items.h"
33
#include "audio/systemSounds.h"
4+
#include "field/field_a3/o_fld_a3.h" //TODO: cleanup
45

56
p_workArea createLCSSelectedTask(s_LCSTask* r4, sLCSTarget* r5);
67
void DrawLCSTarget(s_LCSTask* r14, sVec2_S16* r5, s32 r6);

‎AzelLib/PDS.cpp‎

Lines changed: 5 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "kernel/fileBundle.h"
33
#include "kernel/debug/trace.h"
44
#include "audio/soundDriver.h"
5-
#include "audio/soundDataTable.h"
65
#include "audio/audioDebug.h"
6+
#include "commonOverlay.h"
77

88
#ifdef _WIN32
99
#pragma comment(lib, "Winmm.lib")
@@ -37,65 +37,6 @@ u32 azelCdNumber = 0;
3737

3838
u8 COMMON_DAT[0x98000];
3939

40-
sCommonOverlay_data gCommonFile;
41-
42-
void sCommonOverlay_data::init()
43-
{
44-
// dragonLevelStats
45-
{
46-
sSaturnPtr pDataTable = getSaturnPtr(0x206FF8);
47-
for (int i=0; i<9; i++)
48-
{
49-
sSaturnPtr pData = readSaturnEA(pDataTable + 4 * i);
50-
sDragonLevelStat entry;
51-
52-
for (int j=0; j<3; j++)
53-
{
54-
entry.m0[j] = readSaturnS8(pData + 0 + j);
55-
}
56-
for (int j = 0; j < 3; j++)
57-
{
58-
entry.m3[j] = readSaturnS8(pData + 3 + j);
59-
}
60-
for (int j = 0; j < 3; j++)
61-
{
62-
entry.m6[j] = readSaturnS8(pData + 6 + j);
63-
}
64-
for (int j = 0; j < 3; j++)
65-
{
66-
entry.m9[j] = readSaturnS8(pData + 9 + j);
67-
}
68-
for (int j = 0; j < 3; j++)
69-
{
70-
entry.mC[j] = readSaturnS8(pData + 0xC + j);
71-
}
72-
for (int j = 0; j < 3; j++)
73-
{
74-
entry.mF[j] = readSaturnS8(pData + 0xF + j);
75-
}
76-
for (int j = 0; j < 3; j++)
77-
{
78-
entry.m12[j] = readSaturnS8(pData + 0x12 + j);
79-
}
80-
for (int j = 0; j < 3; j++)
81-
{
82-
entry.m15[j] = readSaturnS8(pData + 0x15 + j);
83-
}
84-
for (int j = 0; j < 3; j++)
85-
{
86-
entry.m18[j] = readSaturnS8(pData + 0x18 + j);
87-
}
88-
for (int j = 0; j < 3; j++)
89-
{
90-
entry.m1B[j] = readSaturnS8(pData + 0x1B + j);
91-
}
92-
dragonLevelStats.push_back(entry);
93-
}
94-
}
95-
96-
soundDataTableInit();
97-
}
98-
9940
bool findFileOnDisc(const std::string& filename)
10041
{
10142
FILE* fHandle = fopen(filename.c_str(), "rb");
@@ -845,15 +786,9 @@ void azelInit()
845786
// stuff
846787

847788
loadFile("COMMON.DAT", COMMON_DAT, 0);
789+
initCommonFile();
790+
848791

849-
{
850-
gCommonFile.m_name = "COMMON.DAT";
851-
gCommonFile.m_data = COMMON_DAT;
852-
gCommonFile.m_dataSize = 0x98000;
853-
gCommonFile.m_base = 0x00200000;
854-
gCommonFile.init();
855-
}
856-
857792
initSMPC();
858793

859794
// stuff
@@ -1098,6 +1033,7 @@ void loopIteration()
10981033

10991034
updateInputs();
11001035

1036+
#ifndef SHIPPING_BUILD
11011037
if (ImGui::Begin("InputState"))
11021038
{
11031039
ImGui::Text("Analog X: %X", graphicEngineStatus.m4514.m0_inputDevices[0].m0_current.m2_analogX);
@@ -1106,6 +1042,7 @@ void loopIteration()
11061042
ImGui::Text("m8_newButtonDown: %X", graphicEngineStatus.m4514.m0_inputDevices[0].m0_current.m8_newButtonDown);
11071043
}
11081044
ImGui::End();
1045+
#endif
11091046

11101047
//updateInputDebug();
11111048

0 commit comments

Comments
 (0)