Skip to content

Commit 1967636

Browse files
eugenekoeugeneko
committed
Stash: Use SteamAudio.
1 parent a62e413 commit 1967636

8 files changed

Lines changed: 143 additions & 6 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
env:
1717
# Common settings.
1818
CMAKE_VERSION: 3.24.x
19+
ci_steam_audio_version: 4.7.0
1920
# Common paths.
2021
ci_source_dir: ${{ github.workspace }}/source-code
2122
ci_build_script: ./source-code/Script/ci_build.sh
@@ -37,7 +38,7 @@ jobs:
3738
# Build the project for Web using both engine SDK and engine in subdirectory.
3839
# SDK build is published to itch.io.
3940
Web:
40-
if: github.event.pull_request.draft == false
41+
if: false
4142
runs-on: ubuntu-latest
4243
needs: [CheckSkipCI]
4344

@@ -190,6 +191,18 @@ jobs:
190191
unzip ${{ env.ci_target_sdk_name }}
191192
mv ./SDK ./SDK-target
192193
194+
- name: Download Steam Audio SDK
195+
uses: robinraju/release-downloader@v1.8
196+
with:
197+
repository: ValveSoftware/steam-audio
198+
tag: v${{ env.ci_steam_audio_version }}
199+
fileName: steamaudio_${{ env.ci_steam_audio_version }}.zip
200+
201+
- name: Unzip Steam Audio SDK
202+
run: |
203+
cd ${{ github.workspace }}
204+
unzip steamaudio_${{ env.ci_steam_audio_version }}.zip
205+
193206
- name: Set up butler
194207
if: ${{ env.ci_publish }}
195208
uses: jdno/setup-butler@v1

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "Plugins/Core.SamplePlugin"]
22
path = Plugins/Core.SamplePlugin
33
url = https://github.com/rbfx/Core.SamplePlugin.git
4+
branch = master
5+
6+
[submodule "Plugins/Core.SteamAudio"]
7+
path = Plugins/Core.SteamAudio
8+
url = https://github.com/rbfx/Core.SteamAudio.git
9+
branch = master

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ endif()
3737
# Add plugins (optional).
3838
include_directories (${CMAKE_SOURCE_DIR}/Plugins)
3939
add_subdirectory (${CMAKE_SOURCE_DIR}/Plugins/Core.SamplePlugin)
40+
add_subdirectory (${CMAKE_SOURCE_DIR}/Plugins/Core.SteamAudio)
4041

4142
# List all plugins used by the application.
4243
set (APP_PLUGIN_NAME "App.Main")
43-
set (APP_PLUGIN_LIST "Plugin.Core.SamplePlugin;${APP_PLUGIN_NAME}")
44+
set (APP_PLUGIN_LIST "Plugin.Core.SamplePlugin;Plugin.Core.SteamAudio;${APP_PLUGIN_NAME}")
4445

4546
# Add main application library with all user code.
4647
add_subdirectory (${CMAKE_SOURCE_DIR}/Source/Application)

‎Plugins/Core.SamplePlugin‎

‎Plugins/Core.SteamAudio‎

Submodule Core.SteamAudio added at 7457ecb

‎Project/Data/Scenes/Scene.xml‎

Lines changed: 118 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,80 @@
33
<attribute name="Name" value="" />
44
<attribute name="Time Scale" value="1.000000" />
55
<attribute name="Elapsed Time" value="0.000000" />
6-
<attribute name="Next Node ID" value="21" />
6+
<attribute name="Next Node ID" value="24" />
77
<attribute name="Next Component ID" value="16777217" />
88
<attribute name="Variables" />
9-
<attribute name="Variable Names" value="" />
9+
<attribute name="Update Events">
10+
<string value="@SceneForcedUpdate" />
11+
<string value="SceneUpdate" />
12+
<string value="AttributeAnimationUpdate" />
13+
<string value="SceneSubsystemUpdate" />
14+
<string value="ScenePostUpdate" />
15+
<string value="@SceneForcedPostUpdate" />
16+
</attribute>
1017
<attribute name="Lightmaps" value="Texture2D" />
1118
<component type="Octree" id="1" />
1219
<component type="RenderPipeline" id="2">
20+
<attribute name="Render Passes">
21+
<variant type="String" value="Postprocess: Exposure" />
22+
<variant type="Bool" value="true" />
23+
<variant type="String" value="Postprocess: SSAO" />
24+
<variant type="Bool" value="false" />
25+
<variant type="String" value="Postprocess: Bloom" />
26+
<variant type="Bool" value="false" />
27+
<variant type="String" value="Postprocess: Draw Outlines" />
28+
<variant type="Bool" value="true" />
29+
<variant type="String" value="Postprocess: Tone Mapping" />
30+
<variant type="Bool" value="true" />
31+
<variant type="String" value="Postprocess: Adjust Color" />
32+
<variant type="Bool" value="true" />
33+
<variant type="String" value="Postprocess: FXAA v2" />
34+
<variant type="Bool" value="false" />
35+
<variant type="String" value="Postprocess: FXAA v3" />
36+
<variant type="Bool" value="false" />
37+
<variant type="String" value="Postprocess: Chromatic Aberration" />
38+
<variant type="Bool" value="false" />
39+
<variant type="String" value="Postprocess: Vignette" />
40+
<variant type="Bool" value="false" />
41+
</attribute>
42+
<attribute name="Render Path Parameters">
43+
<variant name="Vignette: Radius" type="Float" value="0.500000" />
44+
<variant name="Adjust Color: ColorOffset" type="Vector4" value="0 0 0 0" />
45+
<variant name="Exposure: Max" type="Float" value="3.000000" />
46+
<variant name="Vignette: Intensity" type="Float" value="0.400000" />
47+
<variant name="SSAO: Far Distance" type="Float" value="100.000000" />
48+
<variant name="SSAO: Near Distance" type="Float" value="1.000000" />
49+
<variant name="Bloom: Base Intensity" type="Float" value="1.000000" />
50+
<variant name="SSAO: Begin Fade Distance" type="Float" value="100.000000" />
51+
<variant name="Adjust Color: HSVParams" type="Vector4" value="1 1 1 1" />
52+
<variant name="Bloom: Num Iterations" type="Int" value="5" />
53+
<variant name="Bloom: Min Brightness" type="Float" value="0.800000" />
54+
<variant name="SSAO: Strength" type="Float" value="0.700000" />
55+
<variant name="SSAO: Exponent" type="Float" value="1.500000" />
56+
<variant name="Chromatic Aberration: Amount" type="Float" value="0.400000" />
57+
<variant name="SSAO: Downscale" type="Int" value="0" />
58+
<variant name="Bloom: Max Brightness" type="Float" value="1.000000" />
59+
<variant name="Tone Mapping: Mode" type="Int" value="0" />
60+
<variant name="Exposure: Automatic" type="Bool" value="false" />
61+
<variant name="Tone Mapping: Mode@" type="StringVector">
62+
<string value="None" />
63+
<string value="Reinhard" />
64+
<string value="ReinhardWhite" />
65+
<string value="Uncharted2" />
66+
</variant>
67+
<variant name="Exposure: Adapt Rate" type="Float" value="0.600000" />
68+
<variant name="SSAO: Normal Threshold" type="Float" value="0.200000" />
69+
<variant name="Exposure: Min" type="Float" value="1.000000" />
70+
<variant name="SSAO: Depth Threshold" type="Float" value="0.100000" />
71+
<variant name="SSAO: Far Radius" type="Float" value="1.000000" />
72+
<variant name="Bloom: Iteration Intensity Factor" type="Float" value="1.000000" />
73+
<variant name="FXAA: FXAAParams" type="Vector3" value="0.4 0.5 0.75" />
74+
<variant name="SSAO: End Fade Distance" type="Float" value="200.000000" />
75+
<variant name="Adjust Color: ColorFilter" type="Vector4" value="1 1 1 1" />
76+
<variant name="SSAO: Near Radius" type="Float" value="0.050000" />
77+
<variant name="Vignette: Color" type="Color" value="0 0 0 0.4" />
78+
</attribute>
1379
<attribute name="PCF Kernel Size" value="5" />
14-
<attribute name="Post Process Antialiasing" value="FXAA3" />
1580
</component>
1681
<component type="ReflectionProbeManager" id="16777216" />
1782
<component type="PhysicsWorld" id="12" />
@@ -266,6 +331,7 @@
266331
<attribute name="Scale" value="1 1 1" />
267332
<attribute name="Variables" />
268333
<component type="KinematicCharacterController" id="42" />
334+
<component type="SteamSoundListener" id="10" />
269335
<node id="19">
270336
<attribute name="Is Enabled" value="true" />
271337
<attribute name="Name" value="Camera Offset" />
@@ -279,4 +345,53 @@
279345
</component>
280346
</node>
281347
</node>
348+
<node id="21">
349+
<attribute name="Is Enabled" value="true" />
350+
<attribute name="Name" value="Wall" />
351+
<attribute name="Tags" />
352+
<attribute name="Position" value="-8 0.873879 0" />
353+
<attribute name="Rotation" value="1 0 0 0" />
354+
<attribute name="Scale" value="1.8 7.28002 11.7" />
355+
<attribute name="Variables" />
356+
<component type="StaticModel" id="21">
357+
<attribute name="Model" value="Model;Models/Box.mdl" />
358+
<attribute name="Material" value="Material;Materials/CubePlastic.xml" />
359+
</component>
360+
<component type="CollisionShape" id="23" />
361+
<component type="RigidBody" id="39">
362+
<attribute name="Physics Position" value="-8 0.873879 0" />
363+
</component>
364+
<component type="SteamSoundMesh" id="41">
365+
<attribute name="Model" value="Model;Models/Box.mdl" />
366+
</component>
367+
</node>
368+
<node id="22">
369+
<attribute name="Is Enabled" value="true" />
370+
<attribute name="Name" value="Music Player" />
371+
<attribute name="Tags" />
372+
<attribute name="Position" value="-14 0 0" />
373+
<attribute name="Rotation" value="1 0 0 0" />
374+
<attribute name="Scale" value="1 1 1" />
375+
<attribute name="Variables" />
376+
<node id="23">
377+
<attribute name="Is Enabled" value="true" />
378+
<attribute name="Name" value="Teapot" />
379+
<attribute name="Tags" />
380+
<attribute name="Position" value="3.5 0.5 0" />
381+
<attribute name="Rotation" value="1 0 0 0" />
382+
<attribute name="Scale" value="0.2 0.2 0.2" />
383+
<attribute name="Variables" />
384+
<component type="StaticModel" id="40">
385+
<attribute name="Model" value="Model;Models/TeaPot.mdl" />
386+
<attribute name="Material" value="Material;Materials/CubeMetallic.xml;Materials/CubeMetallic.xml" />
387+
<attribute name="Cast Shadows" value="true" />
388+
</component>
389+
<component type="SteamSoundSource" id="22">
390+
<attribute name="Sound" value="Sound;Sounds/Powerup.wav" />
391+
<attribute name="Loop" value="true" />
392+
<attribute name="Distance Attenuation" value="true" />
393+
<attribute name="Occlusion" value="true" />
394+
</component>
395+
</node>
396+
</node>
282397
</scene>

‎Project/Data/Sounds/Powerup.wav‎

43.4 KB
Binary file not shown.

‎Project/Project.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"PluginManager": {
1111
"LoadedPlugins": [
1212
"Plugin.Core.SamplePlugin",
13+
"Plugin.Core.SteamAudio",
1314
"App.Main"
1415
]
1516
}

0 commit comments

Comments
 (0)