Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-26 14:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable opengl texture loading for legacy

Browse source
This commit is contained in:
KillzXGaming 2019-05-31 15:38:49 -04:00
parent 921b267b44
commit ed2a3b8041
8 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

19
Switch_FileFormatsMain/GL/BFRES_Render.cs
View file

@ -208,7 +208,7 @@ namespace FirstPlugin
Vector3 lightDirection = new Vector3(0f, 0f, -1f); Vector3 lightDirection = new Vector3(0f, 0f, -1f);
Vector3 difLightDirection = Vector3.TransformNormal(lightDirection, invertedCamera).Normalized(); Vector3 difLightDirection = Vector3.TransformNormal(lightDirection, invertedCamera).Normalized();
GL.Disable(EnableCap.Texture2D); GL.Enable(EnableCap.Texture2D);
GL.Enable(EnableCap.DepthTest); GL.Enable(EnableCap.DepthTest);
foreach (var model in models) foreach (var model in models)
@ -217,6 +217,18 @@ namespace FirstPlugin
{ {
if (Runtime.RenderModels && model.Checked && shape.Checked) if (Runtime.RenderModels && model.Checked && shape.Checked)
{ {
var mat = shape.GetMaterial();
/* foreach (var tex in mat.TextureMaps)
{
if (tex.Type == STGenericMatTexture.TextureType.Diffuse)
{
int texId = BindTexture((MatTexture)tex, mat, mat.GetResFileU() != null);
}
}*/
GL.ActiveTexture(TextureUnit.Texture0);
GL.BindTexture(TextureTarget.Texture2D, RenderTools.defaultTex.RenderableTex.TexID);
List<int> faces = shape.lodMeshes[shape.DisplayLODIndex].getDisplayFace(); List<int> faces = shape.lodMeshes[shape.DisplayLODIndex].getDisplayFace();
GL.Begin(PrimitiveType.Triangles); GL.Begin(PrimitiveType.Triangles);
@ -225,6 +237,7 @@ namespace FirstPlugin
Vertex vert = shape.vertices[index]; Vertex vert = shape.vertices[index];
float normal = Vector3.Dot(difLightDirection, vert.nrm) * 0.5f + 0.5f; float normal = Vector3.Dot(difLightDirection, vert.nrm) * 0.5f + 0.5f;
GL.Color3(new Vector3(normal)); GL.Color3(new Vector3(normal));
GL.TexCoord2(vert.uv0);
GL.Vertex3(vert.pos); GL.Vertex3(vert.pos);
} }
GL.End(); GL.End();
@ -568,10 +581,10 @@ namespace FirstPlugin
// Bind the texture and create the uniform if the material has the right textures. // Bind the texture and create the uniform if the material has the right textures.
if (hasTex) if (hasTex)
{ {
GL.Uniform1(shader.GetUniformLocation(name), BindTexture(shader, mattex, mat, mat.GetResFileU() != null)); GL.Uniform1(shader.GetUniformLocation(name), BindTexture(mattex, mat, mat.GetResFileU() != null));
} }
} }
public static int BindTexture(SF.Shader shader, MatTexture tex, FMAT material, bool IsWiiU) public static int BindTexture(MatTexture tex, FMAT material, bool IsWiiU)
{ {
BFRES bfres = (BFRES)material.Parent.Parent.Parent.Parent; BFRES bfres = (BFRES)material.Parent.Parent.Parent.Parent;
if (material.Parent == null || bfres == null) //Bfres disposed if (material.Parent == null || bfres == null) //Bfres disposed

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

2
Switch_Toolbox_Library/Generics/RenderableTex.cs
View file

@ -26,7 +26,7 @@ namespace Switch_Toolbox.Library.Rendering
public void LoadOpenGLTexture(STGenericTexture GenericTexture) public void LoadOpenGLTexture(STGenericTexture GenericTexture)
{ {
if (!Runtime.OpenTKInitialized || GLInitialized) if (!Runtime.OpenTKInitialized || GLInitialized || Runtime.UseLegacyGL)
return; return;
if (GenericTexture.ArrayCount <= 0) if (GenericTexture.ArrayCount <= 0)

2
Switch_Toolbox_Library/Runtime.cs
View file

@ -173,7 +173,7 @@ namespace Switch_Toolbox.Library
public static float normalsLineLength = 1; public static float normalsLineLength = 1;
public static bool stereoscopy = false; public static bool stereoscopy = false;
public static bool UseLegacyGL = false; public static bool UseLegacyGL = true;
public static bool OpenTKInitialized = false; public static bool OpenTKInitialized = false;
public static bool useNormalMap = true; public static bool useNormalMap = true;