update moonworks

main
cosmonaut 2021-01-28 18:08:14 -08:00
parent 0eb1534107
commit 2ef5791aa5
2 changed files with 7 additions and 8 deletions

@ -1 +1 @@
Subproject commit eda1efedbe3072cefde88d9092cefa223f3d6086 Subproject commit 55d8e5a1dfe24f5e75ebee3ac1fb0eea456db7d8

View File

@ -46,16 +46,16 @@ namespace MoonWorksTest
var windowWidth = windowCreateInfo.WindowWidth; var windowWidth = windowCreateInfo.WindowWidth;
var windowHeight = windowCreateInfo.WindowHeight; var windowHeight = windowCreateInfo.WindowHeight;
passthroughVertexShaderModule = new ShaderModule(GraphicsDevice, new System.IO.FileInfo("Content/passthrough_vert.spv")); passthroughVertexShaderModule = new ShaderModule(GraphicsDevice, Path.Combine("Content", "passthrough_vert.spv"));
raymarchFragmentShaderModule = new ShaderModule(GraphicsDevice, new System.IO.FileInfo("Content/hexagon_grid.spv")); raymarchFragmentShaderModule = new ShaderModule(GraphicsDevice, Path.Combine("Content", "hexagon_grid.spv"));
raymarchUniforms.time = 0; raymarchUniforms.time = 0;
raymarchUniforms.padding = 0; raymarchUniforms.padding = 0;
raymarchUniforms.resolutionX = windowWidth; raymarchUniforms.resolutionX = windowWidth;
raymarchUniforms.resolutionY = windowHeight; raymarchUniforms.resolutionY = windowHeight;
woodTexture = Texture.LoadPNG(GraphicsDevice, new System.IO.FileInfo("Content/woodgrain.png")); woodTexture = Texture.LoadPNG(GraphicsDevice, "Content/woodgrain.png");
noiseTexture = Texture.LoadPNG(GraphicsDevice, new System.IO.FileInfo("Content/noise.png")); noiseTexture = Texture.LoadPNG(GraphicsDevice, "Content/noise.png");
sampler = new Sampler(GraphicsDevice, SamplerCreateInfo.LinearWrap); sampler = new Sampler(GraphicsDevice, SamplerCreateInfo.LinearWrap);
@ -260,12 +260,11 @@ namespace MoonWorksTest
screenshotBuffer = new Buffer(GraphicsDevice, 0, screenShotBufferSize); screenshotBuffer = new Buffer(GraphicsDevice, 0, screenShotBufferSize);
screenshotThread = new Thread(new ThreadStart(SaveScreenshot)); screenshotThread = new Thread(new ThreadStart(SaveScreenshot));
// music = new DynamicSound(AudioDevice, new FileInfo(Path.Combine("Content", "title_screen.ogg"))); music = StaticSound.LoadOgg(AudioDevice, Path.Combine("Content", "title_screen.ogg"));
music = StaticSound.LoadOgg(AudioDevice, new FileInfo(Path.Combine("Content", "title_screen.ogg")));
musicInstance = music.CreateInstance(); musicInstance = music.CreateInstance();
// musicInstance.Play(); // 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(); musicStream.Play();
} }