From 2ef5791aa508a30ee2bf705f1d937e39f87e637c Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Thu, 28 Jan 2021 18:08:14 -0800 Subject: [PATCH] update moonworks --- lib/MoonWorks | 2 +- src/TestGame.cs | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/MoonWorks b/lib/MoonWorks index eda1efe..55d8e5a 160000 --- a/lib/MoonWorks +++ b/lib/MoonWorks @@ -1 +1 @@ -Subproject commit eda1efedbe3072cefde88d9092cefa223f3d6086 +Subproject commit 55d8e5a1dfe24f5e75ebee3ac1fb0eea456db7d8 diff --git a/src/TestGame.cs b/src/TestGame.cs index caeb476..2ec6dcb 100644 --- a/src/TestGame.cs +++ b/src/TestGame.cs @@ -46,16 +46,16 @@ namespace MoonWorksTest var windowWidth = windowCreateInfo.WindowWidth; var windowHeight = windowCreateInfo.WindowHeight; - passthroughVertexShaderModule = new ShaderModule(GraphicsDevice, new System.IO.FileInfo("Content/passthrough_vert.spv")); - raymarchFragmentShaderModule = new ShaderModule(GraphicsDevice, new System.IO.FileInfo("Content/hexagon_grid.spv")); + passthroughVertexShaderModule = new ShaderModule(GraphicsDevice, Path.Combine("Content", "passthrough_vert.spv")); + raymarchFragmentShaderModule = new ShaderModule(GraphicsDevice, Path.Combine("Content", "hexagon_grid.spv")); raymarchUniforms.time = 0; raymarchUniforms.padding = 0; raymarchUniforms.resolutionX = windowWidth; raymarchUniforms.resolutionY = windowHeight; - woodTexture = Texture.LoadPNG(GraphicsDevice, new System.IO.FileInfo("Content/woodgrain.png")); - noiseTexture = Texture.LoadPNG(GraphicsDevice, new System.IO.FileInfo("Content/noise.png")); + woodTexture = Texture.LoadPNG(GraphicsDevice, "Content/woodgrain.png"); + noiseTexture = Texture.LoadPNG(GraphicsDevice, "Content/noise.png"); sampler = new Sampler(GraphicsDevice, SamplerCreateInfo.LinearWrap); @@ -260,12 +260,11 @@ namespace MoonWorksTest screenshotBuffer = new Buffer(GraphicsDevice, 0, screenShotBufferSize); screenshotThread = new Thread(new ThreadStart(SaveScreenshot)); - // music = new DynamicSound(AudioDevice, new FileInfo(Path.Combine("Content", "title_screen.ogg"))); - music = StaticSound.LoadOgg(AudioDevice, new FileInfo(Path.Combine("Content", "title_screen.ogg"))); + music = StaticSound.LoadOgg(AudioDevice, Path.Combine("Content", "title_screen.ogg")); musicInstance = music.CreateInstance(); // musicInstance.Play(); - musicStream = StreamingSoundOgg.Load(AudioDevice, new FileInfo(Path.Combine("Content", "title_screen.ogg")), false, true); + musicStream = StreamingSoundOgg.Load(AudioDevice, Path.Combine("Content", "title_screen.ogg"), false, true); musicStream.Play(); }