Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.IO;
|
|
|
|
|
using System.Windows.Forms;
|
|
|
|
|
using Switch_Toolbox.Library;
|
|
|
|
|
using GL_EditorFramework.Interfaces;
|
|
|
|
|
using OpenTK.Graphics.OpenGL;
|
|
|
|
|
using OpenTK;
|
|
|
|
|
using Switch_Toolbox.Library.Rendering;
|
|
|
|
|
using GL_EditorFramework.GL_Core;
|
|
|
|
|
using System.Drawing;
|
|
|
|
|
using Switch_Toolbox.Library.IO;
|
|
|
|
|
using Switch_Toolbox.Library.Forms;
|
|
|
|
|
using GL_EditorFramework.EditorDrawables;
|
|
|
|
|
|
|
|
|
|
namespace FirstPlugin
|
|
|
|
|
{
|
|
|
|
|
public class KCL : TreeNodeFile, IFileFormat
|
|
|
|
|
{
|
|
|
|
|
public bool CanSave { get; set; }
|
|
|
|
|
public string[] Description { get; set; } = new string[] { "KCL" };
|
|
|
|
|
public string[] Extension { get; set; } = new string[] { "*.kcl" };
|
|
|
|
|
public string FileName { get; set; }
|
|
|
|
|
public string FilePath { get; set; }
|
|
|
|
|
public IFileInfo IFileInfo { get; set; }
|
|
|
|
|
|
|
|
|
|
public bool Identify(System.IO.Stream stream)
|
|
|
|
|
{
|
|
|
|
|
using (var reader = new Switch_Toolbox.Library.IO.FileReader(stream, true))
|
|
|
|
|
{
|
|
|
|
|
reader.ByteOrder = Syroot.BinaryData.ByteOrder.BigEndian;
|
|
|
|
|
return reader.ReadUInt32() == 0x02020000;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Type[] Types
|
|
|
|
|
{
|
|
|
|
|
get
|
|
|
|
|
{
|
|
|
|
|
List<Type> types = new List<Type>();
|
|
|
|
|
types.Add(typeof(MenuExt));
|
|
|
|
|
return types.ToArray();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
byte[] data;
|
|
|
|
|
|
|
|
|
|
STToolStripItem EndiannessToolstrip;
|
|
|
|
|
|
|
|
|
|
public KCL()
|
|
|
|
|
{
|
|
|
|
|
ContextMenuStrip = new STContextMenuStrip();
|
|
|
|
|
ContextMenuStrip.Items.Add(new STToolStripItem("Save", Save));
|
|
|
|
|
ContextMenuStrip.Items.Add(new STToolStripItem("Export", Export));
|
|
|
|
|
ContextMenuStrip.Items.Add(new STToolStripItem("Replace", Replace));
|
|
|
|
|
|
|
|
|
|
EndiannessToolstrip = new STToolStripItem("Big Endian Mode", SwapEndianess) { Checked = true };
|
|
|
|
|
ContextMenuStrip.Items.Add(EndiannessToolstrip);
|
|
|
|
|
CanSave = true;
|
|
|
|
|
IFileInfo = new IFileInfo();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Load(System.IO.Stream stream)
|
|
|
|
|
{
|
|
|
|
|
Text = FileName;
|
|
|
|
|
Renderer = new KCLRendering();
|
|
|
|
|
|
|
|
|
|
stream.Position = 0;
|
|
|
|
|
data = stream.ToArray();
|
|
|
|
|
Read(data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class MenuExt : IFileMenuExtension
|
|
|
|
|
{
|
|
|
|
|
public STToolStripItem[] NewFileMenuExtensions => null;
|
|
|
|
|
public STToolStripItem[] NewFromFileMenuExtensions => newFileExt;
|
|
|
|
|
public STToolStripItem[] ToolsMenuExtensions => null;
|
|
|
|
|
public STToolStripItem[] TitleBarExtensions => null;
|
|
|
|
|
public STToolStripItem[] CompressionMenuExtensions => null;
|
|
|
|
|
public STToolStripItem[] ExperimentalMenuExtensions => null;
|
|
|
|
|
|
|
|
|
|
STToolStripItem[] newFileExt = new STToolStripItem[2];
|
|
|
|
|
|
|
|
|
|
public MenuExt()
|
|
|
|
|
{
|
|
|
|
|
newFileExt[0] = new STToolStripItem("KCL (Switch)", CreateNew);
|
|
|
|
|
newFileExt[1] = new STToolStripItem("KCL (Wii U)", CreateNew);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void CreateNew(object sender, EventArgs args)
|
|
|
|
|
{
|
|
|
|
|
var ByteOrder = Syroot.BinaryData.ByteOrder.LittleEndian;
|
|
|
|
|
|
|
|
|
|
if (sender.ToString() == "KCL (Wii U)")
|
|
|
|
|
ByteOrder = Syroot.BinaryData.ByteOrder.BigEndian;
|
|
|
|
|
|
|
|
|
|
OpenFileDialog opn = new OpenFileDialog();
|
|
|
|
|
if (opn.ShowDialog() != DialogResult.OK) return;
|
|
|
|
|
var mod = EditorCore.Common.OBJ.Read(new MemoryStream(File.ReadAllBytes(opn.FileName)), null);
|
|
|
|
|
|
|
|
|
|
string name = Path.GetFileNameWithoutExtension(opn.FileName);
|
|
|
|
|
|
|
|
|
|
var f = MarioKart.MK7.KCL.FromOBJ(mod);
|
|
|
|
|
|
|
|
|
|
KCL kcl = new KCL();
|
|
|
|
|
kcl.Text = name;
|
|
|
|
|
kcl.IFileInfo = new IFileInfo();
|
|
|
|
|
kcl.FileName = name;
|
|
|
|
|
kcl.Renderer = new KCLRendering();
|
|
|
|
|
kcl.Read(f.Write(ByteOrder));
|
|
|
|
|
|
|
|
|
|
ObjectEditor editor = new ObjectEditor();
|
|
|
|
|
editor.Text = name;
|
|
|
|
|
editor.treeViewCustom1.Nodes.Add(kcl);
|
|
|
|
|
LibraryGUI.Instance.CreateMdiWindow(editor);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Unload()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
public byte[] Save()
|
|
|
|
|
{
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
public enum GameSet : ushort
|
|
|
|
|
{
|
|
|
|
|
MarioOdyssey = 0x0,
|
|
|
|
|
MarioKart8D = 0x1,
|
|
|
|
|
Splatoon2 = 0x2,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public enum CollisionType_MarioOdssey : ushort
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
public enum CollisionType_MK8D : ushort
|
|
|
|
|
{
|
|
|
|
|
Road_Default = 0,
|
|
|
|
|
Road_Bumpy = 2,
|
|
|
|
|
Road_Sand = 4,
|
|
|
|
|
Offroad_Sand = 6,
|
|
|
|
|
Road_HeavySand = 8,
|
|
|
|
|
Road_IcyRoad = 9,
|
|
|
|
|
OrangeBooster = 10,
|
|
|
|
|
AntiGravityPanel = 11,
|
|
|
|
|
Latiku = 16,
|
|
|
|
|
Wall5 = 17,
|
|
|
|
|
Wall4 = 19,
|
|
|
|
|
Wall = 23,
|
|
|
|
|
Latiku2 = 28,
|
|
|
|
|
Glider = 31,
|
|
|
|
|
SidewalkSlope = 32,
|
|
|
|
|
Road_Dirt = 33,
|
|
|
|
|
Unsolid = 56,
|
|
|
|
|
Water = 60,
|
|
|
|
|
Road_Stone = 64,
|
|
|
|
|
Wall1 = 81,
|
|
|
|
|
Wall2 = 84,
|
|
|
|
|
FinishLine = 93,
|
|
|
|
|
RedFlowerEffect = 95,
|
|
|
|
|
Wall3 = 113,
|
|
|
|
|
WhiteFlowerEffect = 127,
|
|
|
|
|
Road_Metal = 128,
|
|
|
|
|
Road_3DS_MP_Piano = 129,
|
|
|
|
|
Road_RoyalR_Grass = 134,
|
|
|
|
|
TopPillar = 135,
|
|
|
|
|
YoshiCuiruit_Grass = 144,
|
|
|
|
|
YellowFlowerEffect = 159,
|
|
|
|
|
|
|
|
|
|
Road_MetalGating = 160,
|
|
|
|
|
Road_3DS_MP_Xylophone = 161,
|
|
|
|
|
Road_3DS_MP_Vibraphone = 193,
|
|
|
|
|
SNES_RR_road = 227,
|
|
|
|
|
Offroad_Mud = 230,
|
|
|
|
|
Trick = 4096,
|
|
|
|
|
BoosterStunt = 4106,
|
|
|
|
|
TrickEndOfRamp = 4108,
|
|
|
|
|
Trick3 = 4130,
|
|
|
|
|
Trick6 = 4160,
|
|
|
|
|
Trick4 = 4224,
|
|
|
|
|
Trick5 = 8192,
|
|
|
|
|
BoostTrick = 8202,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Save(object sender, EventArgs args)
|
|
|
|
|
{
|
|
|
|
|
SaveFileDialog sfd = new SaveFileDialog();
|
|
|
|
|
sfd.Filter = "Supported Formats|*.kcl";
|
|
|
|
|
sfd.FileName = Text;
|
|
|
|
|
sfd.DefaultExt = ".kcl";
|
|
|
|
|
|
|
|
|
|
if (sfd.ShowDialog() == DialogResult.OK)
|
|
|
|
|
{
|
|
|
|
|
STFileSaver.SaveFileFormat(this, sfd.FileName);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Syroot.BinaryData.ByteOrder endianness;
|
|
|
|
|
public Syroot.BinaryData.ByteOrder Endianness
|
|
|
|
|
{
|
|
|
|
|
get
|
|
|
|
|
{
|
|
|
|
|
return endianness;
|
|
|
|
|
}
|
|
|
|
|
set
|
|
|
|
|
{
|
|
|
|
|
endianness = value;
|
|
|
|
|
if (value == Syroot.BinaryData.ByteOrder.BigEndian)
|
|
|
|
|
EndiannessToolstrip.Checked = true;
|
|
|
|
|
else
|
|
|
|
|
EndiannessToolstrip.Checked = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Export(object sender, EventArgs args)
|
|
|
|
|
{
|
|
|
|
|
if (kcl == null)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
SaveFileDialog sfd = new SaveFileDialog();
|
|
|
|
|
sfd.Filter = "Supported Formats|*.obj";
|
|
|
|
|
sfd.FileName = Text;
|
|
|
|
|
sfd.DefaultExt = ".obj";
|
|
|
|
|
|
|
|
|
|
if (sfd.ShowDialog() == DialogResult.OK)
|
|
|
|
|
{
|
|
|
|
|
kcl.ToOBJ().toWritableObj().WriteObj(sfd.FileName + ".obj");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Replace(object sender, EventArgs args)
|
|
|
|
|
{
|
|
|
|
|
OpenFileDialog ofd = new OpenFileDialog();
|
|
|
|
|
ofd.Filter = "Supported Formats|*.obj";
|
|
|
|
|
|
|
|
|
|
if (ofd.ShowDialog() == DialogResult.OK)
|
|
|
|
|
{
|
|
|
|
|
var mod = EditorCore.Common.OBJ.Read(new MemoryStream(File.ReadAllBytes(ofd.FileName)), null);
|
|
|
|
|
if (mod.Faces.Count > 65535)
|
|
|
|
|
{
|
|
|
|
|
MessageBox.Show("this model has too many faces, only models with less than 65535 triangles can be converted");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
kcl = MarioKart.MK7.KCL.FromOBJ(mod);
|
|
|
|
|
data = kcl.Write(Endianness);
|
|
|
|
|
Read(data);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void SwapEndianess(object sender, EventArgs args)
|
|
|
|
|
{
|
|
|
|
|
if (EndiannessToolstrip.Checked)
|
|
|
|
|
{
|
|
|
|
|
EndiannessToolstrip.Checked = false;
|
|
|
|
|
Endianness = Syroot.BinaryData.ByteOrder.LittleEndian;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
EndiannessToolstrip.Checked = true;
|
|
|
|
|
Endianness = Syroot.BinaryData.ByteOrder.BigEndian;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-25 21:50:05 +01:00
|
|
|
|
public KCLRendering Renderer;
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
bool IsLoaded = false;
|
|
|
|
|
public override void OnClick(TreeView treeView)
|
|
|
|
|
{
|
2019-03-23 18:55:12 +01:00
|
|
|
|
Viewport editor = (Viewport)LibraryGUI.Instance.GetActiveContent(typeof(Viewport));
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
|
2019-03-23 18:55:12 +01:00
|
|
|
|
if (editor == null)
|
|
|
|
|
{
|
|
|
|
|
editor = new Viewport();
|
|
|
|
|
LibraryGUI.Instance.LoadEditor(editor);
|
|
|
|
|
}
|
|
|
|
|
editor.Text = Text;
|
|
|
|
|
editor.Dock = DockStyle.Fill;
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
|
2019-03-23 18:55:12 +01:00
|
|
|
|
if (!IsLoaded)
|
|
|
|
|
{
|
|
|
|
|
editor.AddDrawable(Renderer);
|
|
|
|
|
editor.LoadObjects();
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
}
|
2019-03-23 18:55:12 +01:00
|
|
|
|
|
|
|
|
|
IsLoaded = true;
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public MarioKart.MK7.KCL kcl = null;
|
|
|
|
|
public void Read(byte[] file_data)
|
|
|
|
|
{
|
2019-03-23 22:19:32 +01:00
|
|
|
|
data = file_data;
|
|
|
|
|
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
Endianness = Syroot.BinaryData.ByteOrder.LittleEndian;
|
|
|
|
|
kcl = new MarioKart.MK7.KCL(file_data, Syroot.BinaryData.ByteOrder.LittleEndian);
|
|
|
|
|
}
|
|
|
|
|
catch
|
|
|
|
|
{
|
|
|
|
|
Endianness = Syroot.BinaryData.ByteOrder.BigEndian;
|
|
|
|
|
kcl = new MarioKart.MK7.KCL(file_data, Syroot.BinaryData.ByteOrder.BigEndian);
|
|
|
|
|
}
|
|
|
|
|
Read(kcl);
|
|
|
|
|
}
|
|
|
|
|
public void Read(MarioKart.MK7.KCL kcl)
|
|
|
|
|
{
|
|
|
|
|
Nodes.Clear();
|
|
|
|
|
Renderer.models.Clear();
|
|
|
|
|
|
|
|
|
|
int CurModelIndx = 0;
|
|
|
|
|
foreach (MarioKart.MK7.KCL.KCLModel mdl in kcl.Models)
|
|
|
|
|
{
|
|
|
|
|
KCLModel kclmodel = new KCLModel();
|
|
|
|
|
|
|
|
|
|
kclmodel.Text = "Model " + CurModelIndx;
|
|
|
|
|
|
|
|
|
|
int ft = 0;
|
|
|
|
|
foreach (var plane in mdl.Planes)
|
|
|
|
|
{
|
|
|
|
|
var triangle = mdl.GetTriangle(plane);
|
|
|
|
|
var normal = triangle.Normal;
|
|
|
|
|
var pointA = triangle.PointA;
|
|
|
|
|
var pointB = triangle.PointB;
|
|
|
|
|
var pointC = triangle.PointC;
|
|
|
|
|
|
|
|
|
|
Vertex vtx = new Vertex();
|
|
|
|
|
Vertex vtx2 = new Vertex();
|
|
|
|
|
Vertex vtx3 = new Vertex();
|
|
|
|
|
|
|
|
|
|
vtx.pos = new Vector3(Vec3D_To_Vec3(pointA));
|
|
|
|
|
vtx2.pos = new Vector3(Vec3D_To_Vec3(pointB));
|
|
|
|
|
vtx3.pos = new Vector3(Vec3D_To_Vec3(pointC));
|
|
|
|
|
vtx.nrm = new Vector3(Vec3D_To_Vec3(normal));
|
|
|
|
|
vtx2.nrm = new Vector3(Vec3D_To_Vec3(normal));
|
|
|
|
|
vtx3.nrm = new Vector3(Vec3D_To_Vec3(normal));
|
|
|
|
|
|
|
|
|
|
KCLModel.Face face = new KCLModel.Face();
|
|
|
|
|
face.Text = triangle.Collision.ToString();
|
|
|
|
|
face.MaterialFlag = triangle.Collision;
|
|
|
|
|
|
|
|
|
|
var col = MarioKart.MK7.KCLColors.GetMaterialColor(plane.CollisionType);
|
|
|
|
|
Vector3 ColorSet = new Vector3(col.R, col.G, col.B);
|
|
|
|
|
|
|
|
|
|
vtx.col = new Vector4(ColorSet, 1);
|
|
|
|
|
vtx2.col = new Vector4(ColorSet, 1);
|
|
|
|
|
vtx3.col = new Vector4(ColorSet, 1);
|
|
|
|
|
|
|
|
|
|
kclmodel.faces.Add(ft);
|
|
|
|
|
kclmodel.faces.Add(ft + 1);
|
|
|
|
|
kclmodel.faces.Add(ft + 2);
|
|
|
|
|
|
|
|
|
|
ft += 3;
|
|
|
|
|
|
|
|
|
|
kclmodel.vertices.Add(vtx);
|
|
|
|
|
kclmodel.vertices.Add(vtx2);
|
|
|
|
|
kclmodel.vertices.Add(vtx3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Renderer.models.Add(kclmodel);
|
|
|
|
|
Nodes.Add(kclmodel);
|
|
|
|
|
|
|
|
|
|
CurModelIndx++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public class KCLRendering : EditableObject
|
|
|
|
|
{
|
|
|
|
|
public Vector3 Position = new Vector3(0, 0, 0);
|
|
|
|
|
|
|
|
|
|
protected bool Selected = false;
|
|
|
|
|
protected bool Hovered = false;
|
|
|
|
|
|
|
|
|
|
public override bool IsSelected() => Selected;
|
|
|
|
|
public bool IsHovered() => Selected;
|
|
|
|
|
|
|
|
|
|
// gl buffer objects
|
|
|
|
|
int vbo_position;
|
|
|
|
|
int ibo_elements;
|
|
|
|
|
|
|
|
|
|
//Set the game's material list
|
|
|
|
|
public GameSet GameMaterialSet = GameSet.MarioKart8D;
|
|
|
|
|
public List<KCLModel> models = new List<KCLModel>();
|
|
|
|
|
|
|
|
|
|
private void GenerateBuffers()
|
|
|
|
|
{
|
|
|
|
|
GL.GenBuffers(1, out vbo_position);
|
|
|
|
|
GL.GenBuffers(1, out ibo_elements);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Destroy()
|
|
|
|
|
{
|
|
|
|
|
GL.DeleteBuffer(vbo_position);
|
|
|
|
|
GL.DeleteBuffer(ibo_elements);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void UpdateVertexData()
|
|
|
|
|
{
|
|
|
|
|
if (!Runtime.OpenTKInitialized)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
DisplayVertex[] Vertices;
|
|
|
|
|
int[] Faces;
|
|
|
|
|
|
|
|
|
|
int poffset = 0;
|
|
|
|
|
int voffset = 0;
|
|
|
|
|
List<DisplayVertex> Vs = new List<DisplayVertex>();
|
|
|
|
|
List<int> Ds = new List<int>();
|
|
|
|
|
foreach (KCLModel m in models)
|
|
|
|
|
{
|
|
|
|
|
m.Offset = poffset * 4;
|
|
|
|
|
List<DisplayVertex> pv = m.CreateDisplayVertices();
|
|
|
|
|
Vs.AddRange(pv);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < m.displayFaceSize; i++)
|
|
|
|
|
{
|
|
|
|
|
Ds.Add(m.display[i] + voffset);
|
|
|
|
|
}
|
|
|
|
|
poffset += m.displayFaceSize;
|
|
|
|
|
voffset += pv.Count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Binds
|
|
|
|
|
Vertices = Vs.ToArray();
|
|
|
|
|
Faces = Ds.ToArray();
|
|
|
|
|
|
|
|
|
|
// Bind only once!
|
|
|
|
|
GL.BindBuffer(BufferTarget.ArrayBuffer, vbo_position);
|
|
|
|
|
GL.BufferData<DisplayVertex>(BufferTarget.ArrayBuffer, (IntPtr)(Vertices.Length * DisplayVertex.Size), Vertices, BufferUsageHint.StaticDraw);
|
|
|
|
|
|
|
|
|
|
GL.BindBuffer(BufferTarget.ElementArrayBuffer, ibo_elements);
|
|
|
|
|
GL.BufferData<int>(BufferTarget.ElementArrayBuffer, (IntPtr)(Faces.Length * sizeof(int)), Faces, BufferUsageHint.StaticDraw);
|
|
|
|
|
|
|
|
|
|
LibraryGUI.Instance.UpdateViewport();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public ShaderProgram defaultShaderProgram;
|
|
|
|
|
public ShaderProgram solidColorShaderProgram;
|
|
|
|
|
|
|
|
|
|
public override void Prepare(GL_ControlModern control)
|
|
|
|
|
{
|
|
|
|
|
string pathFrag = System.IO.Path.Combine(Runtime.ExecutableDir, "Shader") + "\\KCL.frag";
|
|
|
|
|
string pathVert = System.IO.Path.Combine(Runtime.ExecutableDir, "Shader") + "\\KCL.vert";
|
|
|
|
|
|
|
|
|
|
var defaultFrag = new FragmentShader(File.ReadAllText(pathFrag));
|
|
|
|
|
var defaultVert = new VertexShader(File.ReadAllText(pathVert));
|
|
|
|
|
|
|
|
|
|
var solidColorFrag = new FragmentShader(
|
|
|
|
|
@"#version 330
|
|
|
|
|
uniform vec4 color;
|
|
|
|
|
void main(){
|
|
|
|
|
gl_FragColor = color;
|
|
|
|
|
}");
|
|
|
|
|
|
|
|
|
|
var solidColorVert = new VertexShader(
|
|
|
|
|
@"#version 330
|
|
|
|
|
in vec3 vPosition;
|
|
|
|
|
in vec3 vNormal;
|
|
|
|
|
in vec3 vColor;
|
|
|
|
|
|
|
|
|
|
out vec3 normal;
|
|
|
|
|
out vec3 color;
|
|
|
|
|
out vec3 position;
|
|
|
|
|
|
|
|
|
|
uniform mat4 mtxMdl;
|
|
|
|
|
uniform mat4 mtxCam;
|
|
|
|
|
|
|
|
|
|
void main(){
|
|
|
|
|
normal = vNormal;
|
|
|
|
|
color = vColor;
|
|
|
|
|
position = vPosition;
|
|
|
|
|
|
|
|
|
|
gl_Position = mtxMdl * mtxCam * vec4(vPosition.xyz, 1.0);
|
|
|
|
|
}");
|
|
|
|
|
|
|
|
|
|
defaultShaderProgram = new ShaderProgram(defaultFrag, defaultVert);
|
|
|
|
|
solidColorShaderProgram = new ShaderProgram(solidColorFrag, solidColorVert);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void Prepare(GL_ControlLegacy control)
|
|
|
|
|
{
|
|
|
|
|
string pathFrag = System.IO.Path.Combine(Runtime.ExecutableDir, "Shader", "Legacy") + "\\KCL.frag";
|
|
|
|
|
string pathVert = System.IO.Path.Combine(Runtime.ExecutableDir, "Shader", "Legacy") + "\\KCL.vert";
|
|
|
|
|
|
|
|
|
|
var defaultFrag = new FragmentShader(File.ReadAllText(pathFrag));
|
|
|
|
|
var defaultVert = new VertexShader(File.ReadAllText(pathVert));
|
|
|
|
|
|
|
|
|
|
var solidColorFrag = new FragmentShader(
|
|
|
|
|
@"#version 330
|
|
|
|
|
uniform vec4 color;
|
|
|
|
|
void main(){
|
|
|
|
|
gl_FragColor = color;
|
|
|
|
|
}");
|
|
|
|
|
|
|
|
|
|
var solidColorVert = new VertexShader(
|
|
|
|
|
@"#version 330
|
|
|
|
|
in vec3 vPosition;
|
|
|
|
|
in vec3 vNormal;
|
|
|
|
|
in vec3 vColor;
|
|
|
|
|
|
|
|
|
|
out vec3 normal;
|
|
|
|
|
out vec3 color;
|
|
|
|
|
out vec3 position;
|
|
|
|
|
|
|
|
|
|
void main(){
|
|
|
|
|
normal = vNormal;
|
|
|
|
|
color = vColor;
|
|
|
|
|
position = vPosition;
|
|
|
|
|
|
|
|
|
|
gl_Position = mvpMatrix * vec4(vPosition.xyz, 1.0);
|
|
|
|
|
}");
|
|
|
|
|
|
|
|
|
|
defaultShaderProgram = new ShaderProgram(defaultFrag, defaultVert);
|
|
|
|
|
solidColorShaderProgram = new ShaderProgram(solidColorFrag, solidColorVert);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void CheckBuffers()
|
|
|
|
|
{
|
|
|
|
|
if (!Runtime.OpenTKInitialized)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
bool buffersWereInitialized = ibo_elements != 0 && vbo_position != 0;
|
|
|
|
|
if (!buffersWereInitialized)
|
|
|
|
|
{
|
|
|
|
|
GenerateBuffers();
|
|
|
|
|
UpdateVertexData();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
public override void Draw(GL_ControlLegacy control, Pass pass)
|
|
|
|
|
{
|
|
|
|
|
CheckBuffers();
|
|
|
|
|
|
|
|
|
|
if (!Runtime.OpenTKInitialized)
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void Draw(GL_ControlModern control, Pass pass)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void Draw(GL_ControlModern control, Pass pass, EditorScene editorScene)
|
|
|
|
|
{
|
|
|
|
|
CheckBuffers();
|
|
|
|
|
|
|
|
|
|
if (!Runtime.OpenTKInitialized)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
control.CurrentShader = defaultShaderProgram;
|
|
|
|
|
|
|
|
|
|
defaultShaderProgram.EnableVertexAttributes();
|
|
|
|
|
|
|
|
|
|
SetRenderSettings(defaultShaderProgram);
|
|
|
|
|
|
|
|
|
|
Matrix4 previewScale = Utils.TransformValues(Vector3.Zero, Vector3.Zero, Runtime.previewScale);
|
|
|
|
|
Matrix4 camMat = previewScale * control.mtxCam * control.mtxProj;
|
2019-03-24 16:31:19 +01:00
|
|
|
|
defaultShaderProgram.SetMatrix4x4("previewScale", ref previewScale);
|
Add files for the new one.
Rework UI from scratch with proper themes and custom controls. MDI windows are now used for workspaces, comparing docs, and multiple usages. Tabs organise multiple workspaces and you can keep mdi windows maximized if you want to only use tabs. Themes currently include dark and white theme but plan to have XML files with list of color and styles
Alot of things optimized. UI is very fast and snappy now
Dae rigging fixed.
Dae bones can be imported.
Dae with textures can be imported and exported to a folder
Custom sampler editor for sampler data.
Texture refs, shader options, params, render info, and basically all material data can be added/removed and edited
User data editor
Update opengl framework by JuPaHe64 to the newest. Includes an origintation cube, multiple models in a scene, and many improvements
Skeleton can be viewed
GFPAK with some fixes in saving
NUTEXB has proper mip map viewing
PTCL Editor (Wii U and Switch). Can edit colors ( Wii U) and view textures. Also EFFN files in smash ultimate can be previewed
Files can be associated with the program and opened with on clicking them
ASTC textures can be viewed
UVs can be viewed. Includes wrap modes and also translating and scaling for some basic edits
Textures use a new editor. It includes channel viewing and some new editing options
Fixed black textures on some wii u bfres
Fixed saving sarcs in sarcs
Shortcut keys have been added in. CTRL + S can save the active file in the currently used window
Fix more issues with bfres crashing
File - New includes BNTX for creating new bntx files from scatch
Raw shader binaries can be extracted from bnsh and bfsha. Yuzu and Ryujinx can decompile these
Sharc files can have source data previewed and shader programs in XML
Aamp v1 and v2 data can be previewed. v1 can be edited and saved atm, v2 will be at a later update
Byaml uses it's own editor instead of a seperate window for easy saving within sarcs
Archives have a hex viewer
Dae exporting greatly improved and can export rigged meshes
Scene, shader param, srt, color, and texture pattern animations can all be previewed (in a list)
Memory usage is greatly improved
Narc (Nitro Archives) can be viewed and extracted.
Fixed importing TGA images
Support importing ASTC textures for bntx
Added in PBR lighting for bfres from my implimentaion in forge
Added gradient background for viewport. This can be edited in the settings
Added skybox background option for viewport. Can load cubemaps
Added grid with customizable cells for viewport.
DDS decompression no longer requires Direct X tex.
Zlib decompression has been improved for opening files that use it
Rigid bones are properly ordered on importing a mesh. May fix some exploding issues.
Endianness for KCL can be toggled for saving. Will be set to what it was using orignally
Tangents can be filled with a constant value. Will allow them to not cause seams nor flat lighting however normal maps may not work as good
Vertex buffers can be added and removed. Also re encoded
Parameters now use drop down panels with values for easier editing
Reworked the bone editor. Everything for a bone can be fully edited now besides the index, billboard index and parent index which get set automatically
Fixed animation scaling for skeletal animations finally!
Textures can be loaded in a tab now with thumbnail displaying for easy real time edits while previewing in the viewport
Fixed support for audio files to be big endian in BARS
Textures for switch now use their own folder. You can easily add textures to this and add textures to bfres that have no bntx. If there are no textures then the bfres will automatically not have one on save.
Animations are split into multiple sub sections for switch's material animation for easier access
Bfres for wii u has better binary exporting and is fully compatiable with Wexos Toolbox (to and from)
Every section can be added in as new for both wii u and switch.
Every section can be renamed properly and mostly everything can be edited. (Key frame editing and a more in depth curve editor later)
Added option to copy UV channel
Bone weights can be previewed
Tons of fixes for the switch bfres library with more games working. Splatoon 2 (more work now), BOTW, Kirby Star Allies, and more!
Fixed 3.3 Wii U bfres from not opening
Wii U Sharcfb files can have shader program data previewed (XML)
And possibly alot more things i missed! All this is still experimental but will improve over the next few weeks
2019-03-23 17:55:09 +01:00
|
|
|
|
|
|
|
|
|
GL.Disable(EnableCap.CullFace);
|
|
|
|
|
|
|
|
|
|
GL.Uniform3(defaultShaderProgram["difLightDirection"], Vector3.TransformNormal(new Vector3(0f, 0f, -1f), camMat.Inverted()).Normalized());
|
|
|
|
|
GL.Uniform3(defaultShaderProgram["difLightColor"], new Vector3(1));
|
|
|
|
|
GL.Uniform3(defaultShaderProgram["ambLightColor"], new Vector3(1));
|
|
|
|
|
|
|
|
|
|
defaultShaderProgram.EnableVertexAttributes();
|
|
|
|
|
SetRenderSettings(defaultShaderProgram);
|
|
|
|
|
|
|
|
|
|
foreach (KCLModel mdl in models)
|
|
|
|
|
{
|
|
|
|
|
DrawModel(mdl, defaultShaderProgram);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
defaultShaderProgram.DisableVertexAttributes();
|
|
|
|
|
|
|
|
|
|
GL.UseProgram(0);
|
|
|
|
|
GL.Disable(EnableCap.DepthTest);
|
|
|
|
|
GL.Enable(EnableCap.DepthTest);
|
|
|
|
|
GL.Enable(EnableCap.CullFace);
|
|
|
|
|
}
|
|
|
|
|
private void SetRenderSettings(ShaderProgram shader)
|
|
|
|
|
{
|
|
|
|
|
shader.SetBoolToInt("renderVertColor", Runtime.renderVertColor);
|
|
|
|
|
GL.Uniform1(defaultShaderProgram["renderType"], (int)Runtime.viewportShading);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
private void DrawModel(KCLModel m, ShaderProgram shader, bool drawSelection = false)
|
|
|
|
|
{
|
|
|
|
|
if (m.faces.Count <= 3)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
SetVertexAttributes(m, shader);
|
|
|
|
|
|
|
|
|
|
if (m.Checked)
|
|
|
|
|
{
|
|
|
|
|
if ((m.IsSelected))
|
|
|
|
|
{
|
|
|
|
|
DrawModelSelection(m, shader);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (Runtime.RenderModelWireframe)
|
|
|
|
|
{
|
|
|
|
|
DrawModelWireframe(m, shader);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (Runtime.RenderModels)
|
|
|
|
|
{
|
|
|
|
|
GL.DrawElements(PrimitiveType.Triangles, m.displayFaceSize, DrawElementsType.UnsignedInt, m.Offset);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
private static void DrawModelSelection(KCLModel p, ShaderProgram shader)
|
|
|
|
|
{
|
|
|
|
|
//This part needs to be reworked for proper outline. Currently would make model disappear
|
|
|
|
|
|
|
|
|
|
GL.DrawElements(PrimitiveType.Triangles, p.displayFaceSize, DrawElementsType.UnsignedInt, p.Offset);
|
|
|
|
|
|
|
|
|
|
GL.Enable(EnableCap.StencilTest);
|
|
|
|
|
// use vertex color for wireframe color
|
|
|
|
|
GL.Uniform1(shader["colorOverride"], 1);
|
|
|
|
|
GL.PolygonMode(MaterialFace.Front, PolygonMode.Line);
|
|
|
|
|
GL.Enable(EnableCap.LineSmooth);
|
|
|
|
|
GL.LineWidth(1.5f);
|
|
|
|
|
GL.DrawElements(PrimitiveType.Triangles, p.displayFaceSize, DrawElementsType.UnsignedInt, p.Offset);
|
|
|
|
|
GL.PolygonMode(MaterialFace.FrontAndBack, PolygonMode.Fill);
|
|
|
|
|
GL.Uniform1(shader["colorOverride"], 0);
|
|
|
|
|
|
|
|
|
|
GL.Enable(EnableCap.DepthTest);
|
|
|
|
|
}
|
|
|
|
|
private void SetVertexAttributes(KCLModel m, ShaderProgram shader)
|
|
|
|
|
{
|
|
|
|
|
GL.BindBuffer(BufferTarget.ArrayBuffer, vbo_position);
|
|
|
|
|
GL.VertexAttribPointer(shader.GetAttribute("vPosition"), 3, VertexAttribPointerType.Float, false, DisplayVertex.Size, 0);
|
|
|
|
|
GL.VertexAttribPointer(shader.GetAttribute("vNormal"), 3, VertexAttribPointerType.Float, false, DisplayVertex.Size, 12);
|
|
|
|
|
GL.VertexAttribPointer(shader.GetAttribute("vColor"), 3, VertexAttribPointerType.Float, false, DisplayVertex.Size, 24);
|
|
|
|
|
GL.BindBuffer(BufferTarget.ElementArrayBuffer, ibo_elements);
|
|
|
|
|
}
|
|
|
|
|
private static void DrawModelWireframe(KCLModel p, ShaderProgram shader)
|
|
|
|
|
{
|
|
|
|
|
// use vertex color for wireframe color
|
|
|
|
|
GL.Uniform1(shader["colorOverride"], 1);
|
|
|
|
|
GL.PolygonMode(MaterialFace.Front, PolygonMode.Line);
|
|
|
|
|
GL.Enable(EnableCap.LineSmooth);
|
|
|
|
|
GL.LineWidth(1.5f);
|
|
|
|
|
GL.DrawElements(PrimitiveType.Triangles, p.displayFaceSize, DrawElementsType.UnsignedInt, p.Offset);
|
|
|
|
|
GL.PolygonMode(MaterialFace.FrontAndBack, PolygonMode.Fill);
|
|
|
|
|
GL.Uniform1(shader["colorOverride"], 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override void ApplyTransformationToSelection(DeltaTransform deltaTransform)
|
|
|
|
|
{
|
|
|
|
|
Position += deltaTransform.Translation;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override bool CanStartDragging() => true;
|
|
|
|
|
|
|
|
|
|
public override Vector3 GetSelectionCenter()
|
|
|
|
|
{
|
|
|
|
|
return Position;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override uint Select(int index, I3DControl control)
|
|
|
|
|
{
|
|
|
|
|
Selected = true;
|
|
|
|
|
control.AttachPickingRedrawer();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override uint SelectDefault(I3DControl control)
|
|
|
|
|
{
|
|
|
|
|
Selected = true;
|
|
|
|
|
control.AttachPickingRedrawer();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override uint SelectAll(I3DControl control)
|
|
|
|
|
{
|
|
|
|
|
Selected = true;
|
|
|
|
|
control.AttachPickingRedrawer();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override uint Deselect(int index, I3DControl control)
|
|
|
|
|
{
|
|
|
|
|
Selected = false;
|
|
|
|
|
control.DetachPickingRedrawer();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public override uint DeselectAll(I3DControl control)
|
|
|
|
|
{
|
|
|
|
|
Selected = false;
|
|
|
|
|
control.DetachPickingRedrawer();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//Convert KCL lib vec3 to opentk one so i can use the cross and dot methods
|
|
|
|
|
public static Vector3 Vec3D_To_Vec3(System.Windows.Media.Media3D.Vector3D v)
|
|
|
|
|
{
|
|
|
|
|
return new Vector3((float)v.X, (float)v.Y, (float)v.Z);
|
|
|
|
|
}
|
|
|
|
|
public struct DisplayVertex
|
|
|
|
|
{
|
|
|
|
|
// Used for rendering.
|
|
|
|
|
public Vector3 pos;
|
|
|
|
|
public Vector3 nrm;
|
|
|
|
|
public Vector3 col;
|
|
|
|
|
|
|
|
|
|
public static int Size = 4 * (3 + 3 + 3);
|
|
|
|
|
}
|
|
|
|
|
public class KCLModel : STGenericObject
|
|
|
|
|
{
|
|
|
|
|
public KCLModel()
|
|
|
|
|
{
|
|
|
|
|
ImageKey = "mesh";
|
|
|
|
|
SelectedImageKey = "mesh";
|
|
|
|
|
|
|
|
|
|
Checked = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public int[] display;
|
|
|
|
|
public int Offset; // For Rendering
|
|
|
|
|
|
|
|
|
|
public int strip = 0x40;
|
|
|
|
|
public int displayFaceSize = 0;
|
|
|
|
|
|
|
|
|
|
public class Face : TreeNode
|
|
|
|
|
{
|
|
|
|
|
public int MaterialFlag = 0;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<DisplayVertex> CreateDisplayVertices()
|
|
|
|
|
{
|
|
|
|
|
// rearrange faces
|
|
|
|
|
display = getDisplayFace().ToArray();
|
|
|
|
|
|
|
|
|
|
List<DisplayVertex> displayVertList = new List<DisplayVertex>();
|
|
|
|
|
|
|
|
|
|
if (faces.Count <= 3)
|
|
|
|
|
return displayVertList;
|
|
|
|
|
|
|
|
|
|
foreach (Vertex v in vertices)
|
|
|
|
|
{
|
|
|
|
|
DisplayVertex displayVert = new DisplayVertex()
|
|
|
|
|
{
|
|
|
|
|
pos = v.pos,
|
|
|
|
|
nrm = v.nrm,
|
|
|
|
|
col = v.col.Xyz,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
displayVertList.Add(displayVert);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return displayVertList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<int> getDisplayFace()
|
|
|
|
|
{
|
|
|
|
|
if ((strip >> 4) == 4)
|
|
|
|
|
{
|
|
|
|
|
displayFaceSize = faces.Count;
|
|
|
|
|
return faces;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
List<int> f = new List<int>();
|
|
|
|
|
|
|
|
|
|
int startDirection = 1;
|
|
|
|
|
int p = 0;
|
|
|
|
|
int f1 = faces[p++];
|
|
|
|
|
int f2 = faces[p++];
|
|
|
|
|
int faceDirection = startDirection;
|
|
|
|
|
int f3;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
f3 = faces[p++];
|
|
|
|
|
if (f3 == 0xFFFF)
|
|
|
|
|
{
|
|
|
|
|
f1 = faces[p++];
|
|
|
|
|
f2 = faces[p++];
|
|
|
|
|
faceDirection = startDirection;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
faceDirection *= -1;
|
|
|
|
|
if ((f1 != f2) && (f2 != f3) && (f3 != f1))
|
|
|
|
|
{
|
|
|
|
|
if (faceDirection > 0)
|
|
|
|
|
{
|
|
|
|
|
f.Add(f3);
|
|
|
|
|
f.Add(f2);
|
|
|
|
|
f.Add(f1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
f.Add(f2);
|
|
|
|
|
f.Add(f3);
|
|
|
|
|
f.Add(f1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
f1 = f2;
|
|
|
|
|
f2 = f3;
|
|
|
|
|
}
|
|
|
|
|
} while (p < faces.Count);
|
|
|
|
|
|
|
|
|
|
displayFaceSize = f.Count;
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|