Skip to content

Commit a08ca2e

Browse files
joeyhodgejoeyhodge
authored
Merge branch 'praydog:master' into master
2 parents fff1b62 + 8823eba commit a08ca2e

11 files changed

Lines changed: 804 additions & 12 deletions

‎CMakeLists.txt‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ FetchContent_Declare(
134134
)
135135
FetchContent_MakeAvailable(bddisasm)
136136

137-
message(STATUS "Fetching kananlib (0bf5781a38a857f0acea3935425d50a1a5a34d3a)...")
137+
message(STATUS "Fetching kananlib (ccf2e5a32cf4c85a90641ae7a35c2b1d636c7636)...")
138138
FetchContent_Declare(
139139
kananlib
140140
GIT_REPOSITORY
141141
https://github.com/cursey/kananlib
142142
GIT_TAG
143-
0bf5781a38a857f0acea3935425d50a1a5a34d3a
143+
ccf2e5a32cf4c85a90641ae7a35c2b1d636c7636
144144
)
145145
FetchContent_MakeAvailable(kananlib)
146146

@@ -572,6 +572,8 @@ if(REF_BUILD_RE2_SDK OR REF_BUILD_FRAMEWORK) # build-re2-sdk
572572
"shared/sdk/SystemArray.cpp"
573573
"shared/sdk/helpers/NativeObject.cpp"
574574
"shared/sdk/renderer/RenderResource.cpp"
575+
"shared/sdk/resources/MasterMaterialResource.cpp"
576+
"shared/sdk/resources/ShaderResource.cpp"
575577
"shared/sdk/Application.hpp"
576578
"shared/sdk/Enums_Internal.hpp"
577579
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -1322,7 +1324,10 @@ if(REF_BUILD_RE2_SDK OR REF_BUILD_FRAMEWORK) # build-re2-sdk
13221324
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
13231325
"shared/sdk/regenny/sf6/via/vec3.hpp"
13241326
"shared/sdk/regenny/sf6/via/vec4.hpp"
1327+
"shared/sdk/renderer/PipelineState.hpp"
13251328
"shared/sdk/renderer/RenderResource.hpp"
1329+
"shared/sdk/resources/MasterMaterialResource.hpp"
1330+
"shared/sdk/resources/ShaderResource.hpp"
13261331
)
13271332

13281333
list(APPEND RE2SDK_SOURCES
@@ -1396,6 +1401,8 @@ if(REF_BUILD_RE2_TDB66SDK OR REF_BUILD_FRAMEWORK) # build-re2tdb66-sdk
13961401
"shared/sdk/SystemArray.cpp"
13971402
"shared/sdk/helpers/NativeObject.cpp"
13981403
"shared/sdk/renderer/RenderResource.cpp"
1404+
"shared/sdk/resources/MasterMaterialResource.cpp"
1405+
"shared/sdk/resources/ShaderResource.cpp"
13991406
"shared/sdk/Application.hpp"
14001407
"shared/sdk/Enums_Internal.hpp"
14011408
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -2146,7 +2153,10 @@ if(REF_BUILD_RE2_TDB66SDK OR REF_BUILD_FRAMEWORK) # build-re2tdb66-sdk
21462153
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
21472154
"shared/sdk/regenny/sf6/via/vec3.hpp"
21482155
"shared/sdk/regenny/sf6/via/vec4.hpp"
2156+
"shared/sdk/renderer/PipelineState.hpp"
21492157
"shared/sdk/renderer/RenderResource.hpp"
2158+
"shared/sdk/resources/MasterMaterialResource.hpp"
2159+
"shared/sdk/resources/ShaderResource.hpp"
21502160
)
21512161

21522162
list(APPEND RE2_TDB66SDK_SOURCES
@@ -2635,6 +2645,8 @@ if(REF_BUILD_RE3_SDK OR REF_BUILD_FRAMEWORK) # build-re3-sdk
26352645
"shared/sdk/SystemArray.cpp"
26362646
"shared/sdk/helpers/NativeObject.cpp"
26372647
"shared/sdk/renderer/RenderResource.cpp"
2648+
"shared/sdk/resources/MasterMaterialResource.cpp"
2649+
"shared/sdk/resources/ShaderResource.cpp"
26382650
"shared/sdk/Application.hpp"
26392651
"shared/sdk/Enums_Internal.hpp"
26402652
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -3385,7 +3397,10 @@ if(REF_BUILD_RE3_SDK OR REF_BUILD_FRAMEWORK) # build-re3-sdk
33853397
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
33863398
"shared/sdk/regenny/sf6/via/vec3.hpp"
33873399
"shared/sdk/regenny/sf6/via/vec4.hpp"
3400+
"shared/sdk/renderer/PipelineState.hpp"
33883401
"shared/sdk/renderer/RenderResource.hpp"
3402+
"shared/sdk/resources/MasterMaterialResource.hpp"
3403+
"shared/sdk/resources/ShaderResource.hpp"
33893404
)
33903405

33913406
list(APPEND RE3SDK_SOURCES
@@ -3459,6 +3474,8 @@ if(REF_BUILD_RE3_TDB67SDK OR REF_BUILD_FRAMEWORK) # build-re3tdb67-sdk
34593474
"shared/sdk/SystemArray.cpp"
34603475
"shared/sdk/helpers/NativeObject.cpp"
34613476
"shared/sdk/renderer/RenderResource.cpp"
3477+
"shared/sdk/resources/MasterMaterialResource.cpp"
3478+
"shared/sdk/resources/ShaderResource.cpp"
34623479
"shared/sdk/Application.hpp"
34633480
"shared/sdk/Enums_Internal.hpp"
34643481
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -4209,7 +4226,10 @@ if(REF_BUILD_RE3_TDB67SDK OR REF_BUILD_FRAMEWORK) # build-re3tdb67-sdk
42094226
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
42104227
"shared/sdk/regenny/sf6/via/vec3.hpp"
42114228
"shared/sdk/regenny/sf6/via/vec4.hpp"
4229+
"shared/sdk/renderer/PipelineState.hpp"
42124230
"shared/sdk/renderer/RenderResource.hpp"
4231+
"shared/sdk/resources/MasterMaterialResource.hpp"
4232+
"shared/sdk/resources/ShaderResource.hpp"
42134233
)
42144234

42154235
list(APPEND RE3_TDB67SDK_SOURCES
@@ -4905,6 +4925,8 @@ if(REF_BUILD_RE4_SDK OR REF_BUILD_FRAMEWORK) # build-re4-sdk
49054925
"shared/sdk/SystemArray.cpp"
49064926
"shared/sdk/helpers/NativeObject.cpp"
49074927
"shared/sdk/renderer/RenderResource.cpp"
4928+
"shared/sdk/resources/MasterMaterialResource.cpp"
4929+
"shared/sdk/resources/ShaderResource.cpp"
49084930
"shared/sdk/Application.hpp"
49094931
"shared/sdk/Enums_Internal.hpp"
49104932
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -5655,7 +5677,10 @@ if(REF_BUILD_RE4_SDK OR REF_BUILD_FRAMEWORK) # build-re4-sdk
56555677
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
56565678
"shared/sdk/regenny/sf6/via/vec3.hpp"
56575679
"shared/sdk/regenny/sf6/via/vec4.hpp"
5680+
"shared/sdk/renderer/PipelineState.hpp"
56585681
"shared/sdk/renderer/RenderResource.hpp"
5682+
"shared/sdk/resources/MasterMaterialResource.hpp"
5683+
"shared/sdk/resources/ShaderResource.hpp"
56595684
)
56605685

56615686
list(APPEND RE4SDK_SOURCES
@@ -5731,6 +5756,8 @@ if(REF_BUILD_RE7_SDK OR REF_BUILD_FRAMEWORK) # build-re7-sdk
57315756
"shared/sdk/SystemArray.cpp"
57325757
"shared/sdk/helpers/NativeObject.cpp"
57335758
"shared/sdk/renderer/RenderResource.cpp"
5759+
"shared/sdk/resources/MasterMaterialResource.cpp"
5760+
"shared/sdk/resources/ShaderResource.cpp"
57345761
"shared/sdk/Application.hpp"
57355762
"shared/sdk/Enums_Internal.hpp"
57365763
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -6481,7 +6508,10 @@ if(REF_BUILD_RE7_SDK OR REF_BUILD_FRAMEWORK) # build-re7-sdk
64816508
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
64826509
"shared/sdk/regenny/sf6/via/vec3.hpp"
64836510
"shared/sdk/regenny/sf6/via/vec4.hpp"
6511+
"shared/sdk/renderer/PipelineState.hpp"
64846512
"shared/sdk/renderer/RenderResource.hpp"
6513+
"shared/sdk/resources/MasterMaterialResource.hpp"
6514+
"shared/sdk/resources/ShaderResource.hpp"
64856515
)
64866516

64876517
list(APPEND RE7SDK_SOURCES
@@ -6555,6 +6585,8 @@ if(REF_BUILD_RE7_TDB49SDK OR REF_BUILD_FRAMEWORK) # build-re7tdb49-sdk
65556585
"shared/sdk/SystemArray.cpp"
65566586
"shared/sdk/helpers/NativeObject.cpp"
65576587
"shared/sdk/renderer/RenderResource.cpp"
6588+
"shared/sdk/resources/MasterMaterialResource.cpp"
6589+
"shared/sdk/resources/ShaderResource.cpp"
65586590
"shared/sdk/Application.hpp"
65596591
"shared/sdk/Enums_Internal.hpp"
65606592
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -7305,7 +7337,10 @@ if(REF_BUILD_RE7_TDB49SDK OR REF_BUILD_FRAMEWORK) # build-re7tdb49-sdk
73057337
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
73067338
"shared/sdk/regenny/sf6/via/vec3.hpp"
73077339
"shared/sdk/regenny/sf6/via/vec4.hpp"
7340+
"shared/sdk/renderer/PipelineState.hpp"
73087341
"shared/sdk/renderer/RenderResource.hpp"
7342+
"shared/sdk/resources/MasterMaterialResource.hpp"
7343+
"shared/sdk/resources/ShaderResource.hpp"
73097344
)
73107345

73117346
list(APPEND RE7_TDB49SDK_SOURCES
@@ -7794,6 +7829,8 @@ if(REF_BUILD_RE8_SDK OR REF_BUILD_FRAMEWORK) # build-re8-sdk
77947829
"shared/sdk/SystemArray.cpp"
77957830
"shared/sdk/helpers/NativeObject.cpp"
77967831
"shared/sdk/renderer/RenderResource.cpp"
7832+
"shared/sdk/resources/MasterMaterialResource.cpp"
7833+
"shared/sdk/resources/ShaderResource.cpp"
77977834
"shared/sdk/Application.hpp"
77987835
"shared/sdk/Enums_Internal.hpp"
77997836
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -8544,7 +8581,10 @@ if(REF_BUILD_RE8_SDK OR REF_BUILD_FRAMEWORK) # build-re8-sdk
85448581
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
85458582
"shared/sdk/regenny/sf6/via/vec3.hpp"
85468583
"shared/sdk/regenny/sf6/via/vec4.hpp"
8584+
"shared/sdk/renderer/PipelineState.hpp"
85478585
"shared/sdk/renderer/RenderResource.hpp"
8586+
"shared/sdk/resources/MasterMaterialResource.hpp"
8587+
"shared/sdk/resources/ShaderResource.hpp"
85488588
)
85498589

85508590
list(APPEND RE8SDK_SOURCES
@@ -8827,6 +8867,8 @@ if(REF_BUILD_DMC5_SDK OR REF_BUILD_FRAMEWORK) # build-dmc5-sdk
88278867
"shared/sdk/SystemArray.cpp"
88288868
"shared/sdk/helpers/NativeObject.cpp"
88298869
"shared/sdk/renderer/RenderResource.cpp"
8870+
"shared/sdk/resources/MasterMaterialResource.cpp"
8871+
"shared/sdk/resources/ShaderResource.cpp"
88308872
"shared/sdk/Application.hpp"
88318873
"shared/sdk/Enums_Internal.hpp"
88328874
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -9577,7 +9619,10 @@ if(REF_BUILD_DMC5_SDK OR REF_BUILD_FRAMEWORK) # build-dmc5-sdk
95779619
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
95789620
"shared/sdk/regenny/sf6/via/vec3.hpp"
95799621
"shared/sdk/regenny/sf6/via/vec4.hpp"
9622+
"shared/sdk/renderer/PipelineState.hpp"
95809623
"shared/sdk/renderer/RenderResource.hpp"
9624+
"shared/sdk/resources/MasterMaterialResource.hpp"
9625+
"shared/sdk/resources/ShaderResource.hpp"
95819626
)
95829627

95839628
list(APPEND DMC5SDK_SOURCES
@@ -9858,6 +9903,8 @@ if(REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK) # build-mhrise-sdk
98589903
"shared/sdk/SystemArray.cpp"
98599904
"shared/sdk/helpers/NativeObject.cpp"
98609905
"shared/sdk/renderer/RenderResource.cpp"
9906+
"shared/sdk/resources/MasterMaterialResource.cpp"
9907+
"shared/sdk/resources/ShaderResource.cpp"
98619908
"shared/sdk/Application.hpp"
98629909
"shared/sdk/Enums_Internal.hpp"
98639910
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -10608,7 +10655,10 @@ if(REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK) # build-mhrise-sdk
1060810655
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
1060910656
"shared/sdk/regenny/sf6/via/vec3.hpp"
1061010657
"shared/sdk/regenny/sf6/via/vec4.hpp"
10658+
"shared/sdk/renderer/PipelineState.hpp"
1061110659
"shared/sdk/renderer/RenderResource.hpp"
10660+
"shared/sdk/resources/MasterMaterialResource.hpp"
10661+
"shared/sdk/resources/ShaderResource.hpp"
1061210662
)
1061310663

1061410664
list(APPEND MHRISESDK_SOURCES
@@ -10891,6 +10941,8 @@ if(REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK) # build-sf6-sdk
1089110941
"shared/sdk/SystemArray.cpp"
1089210942
"shared/sdk/helpers/NativeObject.cpp"
1089310943
"shared/sdk/renderer/RenderResource.cpp"
10944+
"shared/sdk/resources/MasterMaterialResource.cpp"
10945+
"shared/sdk/resources/ShaderResource.cpp"
1089410946
"shared/sdk/Application.hpp"
1089510947
"shared/sdk/Enums_Internal.hpp"
1089610948
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -11641,7 +11693,10 @@ if(REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK) # build-sf6-sdk
1164111693
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
1164211694
"shared/sdk/regenny/sf6/via/vec3.hpp"
1164311695
"shared/sdk/regenny/sf6/via/vec4.hpp"
11696+
"shared/sdk/renderer/PipelineState.hpp"
1164411697
"shared/sdk/renderer/RenderResource.hpp"
11698+
"shared/sdk/resources/MasterMaterialResource.hpp"
11699+
"shared/sdk/resources/ShaderResource.hpp"
1164511700
)
1164611701

1164711702
list(APPEND SF6SDK_SOURCES
@@ -11924,6 +11979,8 @@ if(REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK) # build-dd2-sdk
1192411979
"shared/sdk/SystemArray.cpp"
1192511980
"shared/sdk/helpers/NativeObject.cpp"
1192611981
"shared/sdk/renderer/RenderResource.cpp"
11982+
"shared/sdk/resources/MasterMaterialResource.cpp"
11983+
"shared/sdk/resources/ShaderResource.cpp"
1192711984
"shared/sdk/Application.hpp"
1192811985
"shared/sdk/Enums_Internal.hpp"
1192911986
"shared/sdk/GUIPrimitiveSystem.hpp"
@@ -12674,7 +12731,10 @@ if(REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK) # build-dd2-sdk
1267412731
"shared/sdk/regenny/sf6/via/typeinfo/TypeInfo.hpp"
1267512732
"shared/sdk/regenny/sf6/via/vec3.hpp"
1267612733
"shared/sdk/regenny/sf6/via/vec4.hpp"
12734+
"shared/sdk/renderer/PipelineState.hpp"
1267712735
"shared/sdk/renderer/RenderResource.hpp"
12736+
"shared/sdk/resources/MasterMaterialResource.hpp"
12737+
"shared/sdk/resources/ShaderResource.hpp"
1267812738
)
1267912739

1268012740
list(APPEND DD2SDK_SOURCES

‎cmake.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ tag = "v1.34.10"
175175

176176
[fetch-content.kananlib]
177177
git = "https://github.com/cursey/kananlib"
178-
tag = "0bf5781a38a857f0acea3935425d50a1a5a34d3a"
178+
tag = "ccf2e5a32cf4c85a90641ae7a35c2b1d636c7636"
179179

180180
[target.utility]
181181
type = "static"

0 commit comments

Comments
 (0)