jracek/secretsplash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix after merge

Browse Source
This commit is contained in:
aliaksei.kalosha
2025-04-01 21:50:09 +02:00
parent de21aa6c67
commit a42cce4ee2
6 changed files with 302 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Editor/VramEditorWindow.cs
View File

@@ -56,7 +56,7 @@ namespace SplashEdit.EditorCode
// Ensure minimum window size is applied. // Ensure minimum window size is applied.
this.minSize = MinSize; this.minSize = MinSize;
_psxData = Utils.LoadData(out selectedResolution, out dualBuffering, out verticalLayout, out prohibitedAreas); _psxData = DataStorage.LoadData(out selectedResolution, out dualBuffering, out verticalLayout, out prohibitedAreas);
} }
/// <summary> /// <summary>
@@ -266,7 +266,10 @@ namespace SplashEdit.EditorCode
// Display VRAM image preview. // Display VRAM image preview.
Rect vramRect = GUILayoutUtility.GetRect(VramWidth, VramHeight, GUILayout.ExpandWidth(false)); Rect vramRect = GUILayoutUtility.GetRect(VramWidth, VramHeight, GUILayout.ExpandWidth(false));
if (vramImage)
{
EditorGUI.DrawPreviewTexture(vramRect, vramImage, null, ScaleMode.ScaleToFit, 0, 0, ColorWriteMask.All); EditorGUI.DrawPreviewTexture(vramRect, vramImage, null, ScaleMode.ScaleToFit, 0, 0, ColorWriteMask.All);
}
// Draw framebuffer overlays. // Draw framebuffer overlays.
(Rect buffer1, Rect buffer2) = Utils.BufferForResolution(selectedResolution, verticalLayout, vramRect.min); (Rect buffer1, Rect buffer2) = Utils.BufferForResolution(selectedResolution, verticalLayout, vramRect.min);

1
Runtime/PSXMesh.cs
View File

@@ -30,6 +30,7 @@ namespace SplashEdit.RuntimeCode
public PSXVertex v2; public PSXVertex v2;
public PSXTexture2D Texture; public PSXTexture2D Texture;
public readonly PSXVertex[] Vertexes => new PSXVertex[] { v0, v1, v2 };
} }
/// <summary> /// <summary>

18
Runtime/PSXObjectExporter.cs
View File

@@ -3,7 +3,6 @@ using UnityEngine;
namespace SplashEdit.RuntimeCode namespace SplashEdit.RuntimeCode
{ {
[RequireComponent(typeof(MeshFilter))]
[RequireComponent(typeof(Renderer))] [RequireComponent(typeof(Renderer))]
public class PSXObjectExporter : MonoBehaviour public class PSXObjectExporter : MonoBehaviour
{ {
@@ -55,7 +54,6 @@ namespace SplashEdit.RuntimeCode
if (renderer != null) if (renderer != null)
{ {
Material[] materials = renderer.sharedMaterials; Material[] materials = renderer.sharedMaterials;
Textures = new List<PSXTexture2D>(); // Ensure the list is initialized
foreach (Material mat in materials) foreach (Material mat in materials)
{ {
@@ -84,17 +82,6 @@ namespace SplashEdit.RuntimeCode
} }
} }
} }
else
{
//TODO: Better handle object with default texture
Texture = new PSXTexture2D()
{
BitDepth = BitDepth,
Width = 0,
Height = 0,
};
Texture.OriginalTexture = null;
}
} }
private Texture2D ConvertToTexture2D(Texture texture) private Texture2D ConvertToTexture2D(Texture texture)
@@ -123,11 +110,6 @@ namespace SplashEdit.RuntimeCode
{ {
Mesh = PSXMesh.CreateFromUnityRenderer(renderer, GTEScaling, transform, Textures); Mesh = PSXMesh.CreateFromUnityRenderer(renderer, GTEScaling, transform, Textures);
} }
else
{
// Dynamic meshes do not consider object transformation
Mesh = PSXMesh.CreateFromUnityMesh(meshFilter.sharedMesh, Texture.Width, Texture.Height);
}
} }
} }
} }

108
Runtime/PSXSceneExporter.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -25,11 +26,7 @@ namespace SplashEdit.RuntimeCode
public void Export() public void Export()
{ {
_psxData = DataStorage.LoadData(); _psxData = DataStorage.LoadData(out selectedResolution, out dualBuffering, out verticalLayout, out prohibitedAreas);
selectedResolution = _psxData.OutputResolution;
dualBuffering = _psxData.DualBuffering;
verticalLayout = _psxData.VerticalBuffering;
prohibitedAreas = _psxData.ProhibitedAreas;
_exporters = FindObjectsByType<PSXObjectExporter>(FindObjectsSortMode.None); _exporters = FindObjectsByType<PSXObjectExporter>(FindObjectsSortMode.None);
foreach (PSXObjectExporter exp in _exporters) foreach (PSXObjectExporter exp in _exporters)
@@ -41,15 +38,15 @@ namespace SplashEdit.RuntimeCode
ExportFile(); ExportFile();
} }
private PSXData _psxData; void PackTextures()
private readonly string _psxDataPath = "Assets/PSXData.asset"; {
(Rect buffer1, Rect buffer2) = Utils.BufferForResolution(selectedResolution, verticalLayout);
private Vector2 selectedResolution;
private bool dualBuffering;
private bool verticalLayout;
private List<ProhibitedArea> prohibitedAreas;
private VRAMPixel[,] vramPixels;
List<Rect> framebuffers = new List<Rect> { buffer1 };
if (dualBuffering)
{
framebuffers.Add(buffer2);
}
VRAMPacker tp = new VRAMPacker(framebuffers, prohibitedAreas); VRAMPacker tp = new VRAMPacker(framebuffers, prohibitedAreas);
var packed = tp.PackTexturesIntoVRAM(_exporters); var packed = tp.PackTexturesIntoVRAM(_exporters);
@@ -173,53 +170,51 @@ namespace SplashEdit.RuntimeCode
totalFaces += exporter.Mesh.Triangles.Count; totalFaces += exporter.Mesh.Triangles.Count;
void writeVertexPosition(PSXVertex v)
{
writer.Write((short)v.vx);
writer.Write((short)v.vy);
writer.Write((short)v.vz);
}
void writeVertexNormals(PSXVertex v)
{
writer.Write((short)v.nx);
writer.Write((short)v.ny);
writer.Write((short)v.nz);
}
void writeVertexColor(PSXVertex v)
{
writer.Write((byte)v.r);
writer.Write((byte)v.g);
writer.Write((byte)v.b);
writer.Write((byte)0); // padding
}
void writeVertexUV(PSXVertex v, PSXTexture2D t ,int expander)
{
writer.Write((byte)(v.u + t.PackingX * expander));
writer.Write((byte)(v.v + t.PackingY));
}
void foreachVertexDo(Tri tri, Action<PSXVertex> action)
{
for (int i = 0; i < tri.Vertexes.Length; i++)
{
action(tri.Vertexes[i]);
}
}
foreach (Tri tri in exporter.Mesh.Triangles) foreach (Tri tri in exporter.Mesh.Triangles)
{ {
int expander = 16 / ((int)tri.Texture.BitDepth); int expander = 16 / ((int)tri.Texture.BitDepth);
// Write vertices coordinates // Write vertices coordinates
writer.Write((short)tri.v0.vx); foreachVertexDo(tri, (v) => writeVertexPosition(v));
writer.Write((short)tri.v0.vy);
writer.Write((short)tri.v0.vz);
writer.Write((short)tri.v1.vx);
writer.Write((short)tri.v1.vy);
writer.Write((short)tri.v1.vz);
writer.Write((short)tri.v2.vx);
writer.Write((short)tri.v2.vy);
writer.Write((short)tri.v2.vz);
// Write vertex normals for v0 only // Write vertex normals for v0 only
writer.Write((short)tri.v0.nx); writeVertexNormals(tri.v0);
writer.Write((short)tri.v0.ny);
writer.Write((short)tri.v0.nz);
// Write vertex colors with padding // Write vertex colors with padding
writer.Write((byte)tri.v0.r); foreachVertexDo(tri, (v) => writeVertexColor(v));
writer.Write((byte)tri.v0.g);
writer.Write((byte)tri.v0.b);
writer.Write((byte)0); // padding
writer.Write((byte)tri.v1.r);
writer.Write((byte)tri.v1.g);
writer.Write((byte)tri.v1.b);
writer.Write((byte)0); // padding
writer.Write((byte)tri.v2.r);
writer.Write((byte)tri.v2.g);
writer.Write((byte)tri.v2.b);
writer.Write((byte)0); // padding
// Write UVs for each vertex, adjusting for texture packing // Write UVs for each vertex, adjusting for texture packing
writer.Write((byte)(tri.v0.u + tri.Texture.PackingX * expander)); foreachVertexDo(tri, (v) => writeVertexUV(v, tri.Texture, expander));
writer.Write((byte)(tri.v0.v + tri.Texture.PackingY));
writer.Write((byte)(tri.v1.u + tri.Texture.PackingX * expander));
writer.Write((byte)(tri.v1.v + tri.Texture.PackingY));
writer.Write((byte)(tri.v2.u + tri.Texture.PackingX * expander));
writer.Write((byte)(tri.v2.v + tri.Texture.PackingY));
writer.Write((ushort)0); // padding writer.Write((ushort)0); // padding
@@ -227,18 +222,7 @@ namespace SplashEdit.RuntimeCode
TPageAttr tpage = new TPageAttr(); TPageAttr tpage = new TPageAttr();
tpage.SetPageX(tri.Texture.TexpageX); tpage.SetPageX(tri.Texture.TexpageX);
tpage.SetPageY(tri.Texture.TexpageY); tpage.SetPageY(tri.Texture.TexpageY);
switch (tri.Texture.BitDepth) tpage.Set(tri.Texture.BitDepth.ToColorMode());
{
case PSXBPP.TEX_4BIT:
tpage.Set(TPageAttr.ColorMode.Mode4Bit);
break;
case PSXBPP.TEX_8BIT:
tpage.Set(TPageAttr.ColorMode.Mode8Bit);
break;
case PSXBPP.TEX_16BIT:
tpage.Set(TPageAttr.ColorMode.Mode16Bit);
break;
}
tpage.SetDithering(true); tpage.SetDithering(true);
writer.Write((ushort)tpage.info); writer.Write((ushort)tpage.info);
writer.Write((ushort)tri.Texture.ClutPackingX); writer.Write((ushort)tri.Texture.ClutPackingX);

2
Runtime/TexturePacker.cs
View File

@@ -102,7 +102,7 @@ namespace SplashEdit.RuntimeCode
foreach (var texture in group.OrderByDescending(tex => tex.QuantizedWidth * tex.Height)) foreach (var texture in group.OrderByDescending(tex => tex.QuantizedWidth * tex.Height))
{ {
// Remove duplicate textures // Remove duplicate textures
if (uniqueTextures.Where(tex => tex.OriginalTexture != null).Any(tex => tex.OriginalTexture.GetInstanceID() == obj.Texture.OriginalTexture.GetInstanceID() && tex.BitDepth == obj.Texture.BitDepth)) if (uniqueTextures.Any(tex => tex.OriginalTexture.GetInstanceID() == texture.OriginalTexture.GetInstanceID() && tex.BitDepth == texture.BitDepth))
{ {
// Skip packing this texture – it will be replaced later. // Skip packing this texture – it will be replaced later.
continue; continue;

45
Runtime/Utils.cs
View File

@@ -10,6 +10,26 @@ namespace SplashEdit.RuntimeCode
public static class DataStorage public static class DataStorage
{ {
private static readonly string psxDataPath = "Assets/PSXData.asset"; private static readonly string psxDataPath = "Assets/PSXData.asset";
/// <summary>
/// Loads stored PSX data from the asset.
/// </summary>
public static PSXData LoadData(out Vector2 selectedResolution, out bool dualBuffering, out bool verticalLayout, out List<ProhibitedArea> prohibitedAreas)
{
var _psxData = AssetDatabase.LoadAssetAtPath<PSXData>(psxDataPath);
if (!_psxData)
{
_psxData = ScriptableObject.CreateInstance<PSXData>();
AssetDatabase.CreateAsset(_psxData, psxDataPath);
AssetDatabase.SaveAssets();
}
selectedResolution = _psxData.OutputResolution;
dualBuffering = _psxData.DualBuffering;
verticalLayout = _psxData.VerticalBuffering;
prohibitedAreas = _psxData.ProhibitedAreas;
return _psxData;
}
public static PSXData LoadData() public static PSXData LoadData()
{ {
PSXData psxData = AssetDatabase.LoadAssetAtPath<PSXData>(psxDataPath); PSXData psxData = AssetDatabase.LoadAssetAtPath<PSXData>(psxDataPath);
@@ -288,8 +308,6 @@ namespace SplashEdit.RuntimeCode
public static class Utils public static class Utils
{ {
private static string _psxDataPath = "Assets/PSXData.asset";
public static (Rect, Rect) BufferForResolution(Vector2 selectedResolution, bool verticalLayout, Vector2 offset = default) public static (Rect, Rect) BufferForResolution(Vector2 selectedResolution, bool verticalLayout, Vector2 offset = default)
{ {
if (offset == default) if (offset == default)
@@ -302,24 +320,15 @@ namespace SplashEdit.RuntimeCode
return (buffer1, buffer2); return (buffer1, buffer2);
} }
/// <summary> public static TPageAttr.ColorMode ToColorMode(this PSXBPP depth)
/// Loads stored PSX data from the asset.
/// </summary>
public static PSXData LoadData(out Vector2 selectedResolution, out bool dualBuffering, out bool verticalLayout, out List<ProhibitedArea> prohibitedAreas)
{ {
var _psxData = AssetDatabase.LoadAssetAtPath<PSXData>(_psxDataPath); return depth switch
if (!_psxData)
{ {
_psxData = ScriptableObject.CreateInstance<PSXData>(); PSXBPP.TEX_4BIT => TPageAttr.ColorMode.Mode4Bit,
AssetDatabase.CreateAsset(_psxData, _psxDataPath); PSXBPP.TEX_8BIT => TPageAttr.ColorMode.Mode8Bit,
AssetDatabase.SaveAssets(); PSXBPP.TEX_16BIT => TPageAttr.ColorMode.Mode16Bit,
} _ => throw new System.NotImplementedException(),
};
selectedResolution = _psxData.OutputResolution;
dualBuffering = _psxData.DualBuffering;
verticalLayout = _psxData.VerticalBuffering;
prohibitedAreas = _psxData.ProhibitedAreas;
return _psxData;
} }
} }
} }