Skip to content

Commit 115c1ee

Browse files
authored
Merge pull request #81 from w23/rtbr
patch up things to load raising the bar: redux Changes: - Added RTB:R config with default dir layout - Added Source SDK materials - Added uploading win64 build results as artifacts for CI builds. Now PR builds can be downloaded and tested. Some of the textures will still be missing on Linux due to case-sensitive filesystem. Seems to work fine on Windows. fixes #80
2 parents 5da662e + 97614f3 commit 115c1ee

File tree

4 files changed

+39
-8
lines changed

4 files changed

+39
-8
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,19 @@ jobs:
2626
- name: Build
2727
working-directory: ${{ runner.workspace }}/build
2828
run: cmake --build . --config Release
29-
- name: prepare release archive
30-
if: matrix.os == 'windows-latest' && startsWith(github.ref, 'refs/tags/v')
29+
- name: Prepare release archive
30+
if: matrix.os == 'windows-latest'
3131
run: |
32-
cmake -E make_directory ${{ runner.workspace }}/OpenSource-windows
33-
cmake -E copy ${{ github.workspace }}/misc/hl1.cfg ${{ github.workspace }}/misc/hl2.cfg ${{ github.workspace }}/misc/hl2eps.cfg ${{ github.workspace }}/misc/hl1.bat ${{ github.workspace }}/misc/hl2.bat ${{ github.workspace }}/misc/hl2eps.bat ${{ runner.workspace }}/build/Release/OpenSource.exe ${{ github.workspace }}/README.md ${{ runner.workspace }}/OpenSource-windows
34-
powershell Compress-Archive ${{ runner.workspace }}/OpenSource-windows/* ${{ runner.workspace }}/OpenSource-windows.zip
35-
- name: GH Release
32+
cmake -E make_directory ${{ runner.workspace }}/OpenSource-win64
33+
cmake -E copy ${{ github.workspace }}/misc/hl1.cfg ${{ github.workspace }}/misc/hl2.cfg ${{ github.workspace }}/misc/hl2eps.cfg ${{ github.workspace }}/misc/hl1.bat ${{ github.workspace }}/misc/hl2.bat ${{ github.workspace }}/misc/hl2eps.bat ${{ runner.workspace }}/build/Release/OpenSource.exe ${{ github.workspace }}/README.md ${{ runner.workspace }}/OpenSource-win64
34+
powershell Compress-Archive ${{ runner.workspace }}/OpenSource-win64/* ${{ runner.workspace }}/OpenSource-win64.zip
35+
- name: Upload artifacts
36+
if: matrix.os == 'windows-latest'
37+
uses: actions/upload-artifact@v3
38+
with:
39+
name: OpenSource-win64
40+
path: ${{ runner.workspace }}/OpenSource-win64
41+
- name: Make GitHub release if tagged
3642
if: matrix.os == 'windows-latest' && startsWith(github.ref, 'refs/tags/v')
3743
uses: softprops/[email protected]
3844
env:
@@ -50,4 +56,4 @@ jobs:
5056
prerelease: true # optional
5157
# Newline-delimited list of path globs for asset files to upload
5258
# TODO prepare proper zip with useful things
53-
files: ${{ runner.workspace }}/OpenSource-windows.zip
59+
files: ${{ runner.workspace }}/OpenSource-win64.zip

misc/rtbr.cfg

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
gamedir "Source SDK Base 2013 Singleplayer"
2+
vpk "hl2/hl2_textures_dir.vpk"
3+
vpk "hl2/hl2_misc_dir.vpk"
4+
vpk "episodic/ep1_pak_dir.vpk"
5+
vpk "ep2/ep2_pak_dir.vpk"
6+
vpk "sourcetest/sourcetest_pak_dir.vpk"
7+
vpk "platform/platform_misc_dir.vpk"
8+
dir ""
9+
10+
gamedir "../sourcemods/RaisingTheBarRedux_div2"
11+
vpk "mapbase/mapbase_shared/shared_content_v7_0_dir.vpk"
12+
vpk "mapbase/mapbase_hl2/hl2_materials_dir.vpk"
13+
vpk "mapbase/mapbase_hl2/lostcoast_materials_dir.vpk"
14+
vpk "mapbase/mapbase_hl2/hl2_scenes_dir.vpk"
15+
vpk "mapbase/mapbase_hl2/hl2_mapbase_content_dir.vpk"
16+
vpk "mapbase/mapbase_episodic/episodic_mapbase_content_dir.vpk"
17+
vpk "mapbase/mapbase_episodic/episodic_scenes_dir.vpk"
18+
vpk "mapbase/mapbase_episodic/episodic_materials_dir.vpk"
19+
dir ""
20+
21+
max_maps 100
22+
map rtbr_d1_trainstation01

src/OpenSource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#endif
1717

1818
static char persistent_data[128*1024*1024];
19-
static char temp_data[128*1024*1024];
19+
static char temp_data[256*1024*1024];
2020

2121
static struct Stack stack_temp = {
2222
.storage = temp_data,

src/material.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,12 @@ static VMFAction materialParserCallback(VMFState *state, VMFEntryType entry, con
125125
} else {
126126
ctx->shader = kv->key;
127127
if (strncasecmp("unlitgeneric", kv->key.str, kv->key.length) == 0
128+
|| strncasecmp("SDK_UnlitGeneric", kv->key.str, kv->key.length) == 0
128129
|| strncasecmp("sky", kv->key.str, kv->key.length) == 0)
129130
ctx->mat->shader = MShader_UnlitGeneric;
130131
else if (strncasecmp("lightmappedgeneric", kv->key.str, kv->key.length) == 0
132+
|| strncasecmp("SDK_LightmappedGeneric", kv->key.str, kv->key.length) == 0
133+
|| strncasecmp("sdk_worldvertextransition", kv->key.str, kv->key.length) == 0
131134
|| strncasecmp("worldvertextransition", kv->key.str, kv->key.length) == 0)
132135
ctx->mat->shader = MShader_LightmappedGeneric;
133136
else

0 commit comments

Comments
 (0)