From 0000450a81d96fea97c3dae579b957d0766d706c Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Wed, 19 Apr 2023 00:52:12 -0700 Subject: [PATCH] rename Texture loader methods for clarity --- Cube/CubeGame.cs | 2 +- Texture3D/Texture3DGame.cs | 2 +- TextureMipmaps/TextureMipmapsGame.cs | 2 +- TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs | 2 +- TexturedQuad/TexturedQuadGame.cs | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cube/CubeGame.cs b/Cube/CubeGame.cs index 9c9c029..8db40ed 100644 --- a/Cube/CubeGame.cs +++ b/Cube/CubeGame.cs @@ -60,7 +60,7 @@ namespace MoonWorks.Test 0 ); - Texture.SetDataFromFile(cmdbuf, textureSlice, imagePaths[i]); + Texture.SetDataFromImageFile(cmdbuf, textureSlice, imagePaths[i]); } } diff --git a/Texture3D/Texture3DGame.cs b/Texture3D/Texture3DGame.cs index 23bd361..e5e49fe 100644 --- a/Texture3D/Texture3DGame.cs +++ b/Texture3D/Texture3DGame.cs @@ -80,7 +80,7 @@ namespace MoonWorks.Test i ); - Texture.SetDataFromFile( + Texture.SetDataFromImageFile( cmdbuf, slice, TestUtils.GetTexturePath($"tex3d_{i}.png") diff --git a/TextureMipmaps/TextureMipmapsGame.cs b/TextureMipmaps/TextureMipmapsGame.cs index fadff4c..66e4144 100644 --- a/TextureMipmaps/TextureMipmapsGame.cs +++ b/TextureMipmaps/TextureMipmapsGame.cs @@ -80,7 +80,7 @@ namespace MoonWorks.Test (uint) i ); - Texture.SetDataFromFile(cmdbuf, slice, TestUtils.GetTexturePath($"mip{i}.png")); + Texture.SetDataFromImageFile(cmdbuf, slice, TestUtils.GetTexturePath($"mip{i}.png")); } GraphicsDevice.Submit(cmdbuf); diff --git a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs index 60ed8d5..7582198 100644 --- a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs +++ b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs @@ -68,7 +68,7 @@ namespace MoonWorks.Test 0, 2, 3, } ); - texture = Texture.FromFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.png")); + texture = Texture.FromImageFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.png")); GraphicsDevice.Submit(cmdbuf); } diff --git a/TexturedQuad/TexturedQuadGame.cs b/TexturedQuad/TexturedQuadGame.cs index 0cc5111..14c21de 100644 --- a/TexturedQuad/TexturedQuadGame.cs +++ b/TexturedQuad/TexturedQuadGame.cs @@ -94,10 +94,10 @@ namespace MoonWorks.Test 0, 2, 3, } ); - textures[0] = Texture.FromFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.png")); - textures[1] = Texture.FromData(GraphicsDevice, cmdbuf, pngBytes); - textures[2] = Texture.FromFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.qoi")); - textures[3] = Texture.FromData(GraphicsDevice, cmdbuf, qoiBytes); + textures[0] = Texture.FromImageFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.png")); + textures[1] = Texture.FromImageBytes(GraphicsDevice, cmdbuf, pngBytes); + textures[2] = Texture.FromImageFile(GraphicsDevice, cmdbuf, TestUtils.GetTexturePath("ravioli.qoi")); + textures[3] = Texture.FromImageBytes(GraphicsDevice, cmdbuf, qoiBytes); GraphicsDevice.Submit(cmdbuf); }