summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryum <yum.food.vr@gmail.com>2023-08-10 14:02:56 -0700
committeryum <yum.food.vr@gmail.com>2023-08-10 14:02:56 -0700
commit8fcc40142d08ad2dce1300191de1ed502d23714f (patch)
tree8f9741c43b774b21fa518533c0da181bc2e87287
parent5f33e4efdaa5cdb3773d7eb111b1f74b74721f29 (diff)
Bugfix: shader no longer shows up as pinkv0.14.0
Fix up .mat to point to correct textures/shader. Also delete templates after copying shaders.
-rw-r--r--GUI/GUI/GUI/PythonWrapper.cpp19
-rw-r--r--UnityAssets/Materials/TaSTT_Text.mat122
2 files changed, 26 insertions, 115 deletions
diff --git a/GUI/GUI/GUI/PythonWrapper.cpp b/GUI/GUI/GUI/PythonWrapper.cpp
index 9c4fd85..2223706 100644
--- a/GUI/GUI/GUI/PythonWrapper.cpp
+++ b/GUI/GUI/GUI/PythonWrapper.cpp
@@ -663,6 +663,25 @@ bool PythonWrapper::GenerateAnimator(
Log(out, "success!\n");
}
{
+ Log(out, "Deleting shader templates... ");
+ try {
+ if (std::filesystem::exists(tastt_shaders_path) && std::filesystem::is_directory(tastt_shaders_path)) {
+ for (const auto& entry : std::filesystem::directory_iterator(tastt_shaders_path)) {
+ if (entry.is_regular_file()) {
+ if (entry.path().stem().string().ends_with("_template")) {
+ std::filesystem::remove(entry.path());
+ }
+ }
+ }
+ }
+ }
+ catch (const std::exception& e) {
+ Log(out, "failed!\n");
+ Log(out, "Error: {}\n", e.what());
+ }
+ Log(out, "success!\n");
+ }
+ {
Log(out, "Copying canned fonts... ");
auto opts = std::filesystem::copy_options();
opts |= std::filesystem::copy_options::overwrite_existing;
diff --git a/UnityAssets/Materials/TaSTT_Text.mat b/UnityAssets/Materials/TaSTT_Text.mat
index 4651629..c7da6e2 100644
--- a/UnityAssets/Materials/TaSTT_Text.mat
+++ b/UnityAssets/Materials/TaSTT_Text.mat
@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: STTExperiment
- m_Shader: {fileID: 4800000, guid: 54bb178efaf25f446a83bf02d6d15033, type: 3}
+ m_Shader: {fileID: 4800000, guid: feba055fa9e7f9543aaae032a30ec878, type: 3}
m_ShaderKeywords: BG_SMOOTHNESS_INVERT_ON ENABLE_DITHERING_ON ENABLE_RAY_MARCH_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -68,27 +68,27 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0x2000_0x3FFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 45d1d35ef90dd5742bab73718b1fa64e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0x4000_0x5FFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: fbb9dcb303ae5fc46a1b4f6b82b55a16, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0x6000_0x7FFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: cf2fc1dc6a21e9d42bf08d8148dba0b7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0x8000_0x9FFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: d06c79dd35cbaa94c81b2eb9240a7c57, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0xA000_0xBFFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: dea31226b42fe7e4d9470806d43afcf8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Font_0xC000_0xDFFF:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: e8c2974f31efa7a4e9e7588c90561a85, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Img_0xE000_0xE03F:
@@ -133,114 +133,6 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- - _Letter_Row00_Col00_Byte0: 0
- - _Letter_Row00_Col01_Byte0: 0
- - _Letter_Row00_Col02_Byte0: 0
- - _Letter_Row00_Col03_Byte0: 0
- - _Letter_Row00_Col04_Byte0: 0
- - _Letter_Row00_Col05_Byte0: 0
- - _Letter_Row00_Col06_Byte0: 0
- - _Letter_Row00_Col07_Byte0: 0
- - _Letter_Row00_Col08_Byte0: 0
- - _Letter_Row00_Col09_Byte0: 0
- - _Letter_Row00_Col10_Byte0: 0
- - _Letter_Row00_Col11_Byte0: 0
- - _Letter_Row00_Col12_Byte0: 0
- - _Letter_Row00_Col13_Byte0: 0
- - _Letter_Row00_Col14_Byte0: 0
- - _Letter_Row00_Col15_Byte0: 0
- - _Letter_Row00_Col16_Byte0: 0
- - _Letter_Row00_Col17_Byte0: 0
- - _Letter_Row00_Col18_Byte0: 0
- - _Letter_Row00_Col19_Byte0: 0
- - _Letter_Row00_Col20_Byte0: 0
- - _Letter_Row00_Col21_Byte0: 0
- - _Letter_Row00_Col22_Byte0: 0
- - _Letter_Row00_Col23_Byte0: 0
- - _Letter_Row00_Col24_Byte0: 0
- - _Letter_Row00_Col25_Byte0: 0
- - _Letter_Row00_Col26_Byte0: 0
- - _Letter_Row00_Col27_Byte0: 0
- - _Letter_Row00_Col28_Byte0: 0
- - _Letter_Row00_Col29_Byte0: 0
- - _Letter_Row00_Col30_Byte0: 0
- - _Letter_Row00_Col31_Byte0: 0
- - _Letter_Row00_Col32_Byte0: 0
- - _Letter_Row00_Col33_Byte0: 0
- - _Letter_Row00_Col34_Byte0: 0
- - _Letter_Row00_Col35_Byte0: 0
- - _Letter_Row01_Col00_Byte0: 0
- - _Letter_Row01_Col01_Byte0: 0
- - _Letter_Row01_Col02_Byte0: 0
- - _Letter_Row01_Col03_Byte0: 0
- - _Letter_Row01_Col04_Byte0: 0
- - _Letter_Row01_Col05_Byte0: 0
- - _Letter_Row01_Col06_Byte0: 0
- - _Letter_Row01_Col07_Byte0: 0
- - _Letter_Row01_Col08_Byte0: 0
- - _Letter_Row01_Col09_Byte0: 0
- - _Letter_Row01_Col10_Byte0: 0
- - _Letter_Row01_Col11_Byte0: 0
- - _Letter_Row01_Col12_Byte0: 0
- - _Letter_Row01_Col13_Byte0: 0
- - _Letter_Row01_Col14_Byte0: 0
- - _Letter_Row01_Col15_Byte0: 0
- - _Letter_Row01_Col16_Byte0: 0
- - _Letter_Row01_Col17_Byte0: 0
- - _Letter_Row01_Col18_Byte0: 0
- - _Letter_Row01_Col19_Byte0: 0
- - _Letter_Row01_Col20_Byte0: 0
- - _Letter_Row01_Col21_Byte0: 0
- - _Letter_Row01_Col22_Byte0: 0
- - _Letter_Row01_Col23_Byte0: 0
- - _Letter_Row01_Col24_Byte0: 0
- - _Letter_Row01_Col25_Byte0: 0
- - _Letter_Row01_Col26_Byte0: 0
- - _Letter_Row01_Col27_Byte0: 0
- - _Letter_Row01_Col28_Byte0: 0
- - _Letter_Row01_Col29_Byte0: 0
- - _Letter_Row01_Col30_Byte0: 0
- - _Letter_Row01_Col31_Byte0: 0
- - _Letter_Row01_Col32_Byte0: 0
- - _Letter_Row01_Col33_Byte0: 0
- - _Letter_Row01_Col34_Byte0: 0
- - _Letter_Row01_Col35_Byte0: 0
- - _Letter_Row02_Col00_Byte0: 0
- - _Letter_Row02_Col01_Byte0: 0
- - _Letter_Row02_Col02_Byte0: 0
- - _Letter_Row02_Col03_Byte0: 0
- - _Letter_Row02_Col04_Byte0: 0
- - _Letter_Row02_Col05_Byte0: 0
- - _Letter_Row02_Col06_Byte0: 0
- - _Letter_Row02_Col07_Byte0: 0
- - _Letter_Row02_Col08_Byte0: 0
- - _Letter_Row02_Col09_Byte0: 0
- - _Letter_Row02_Col10_Byte0: 0
- - _Letter_Row02_Col11_Byte0: 0
- - _Letter_Row02_Col12_Byte0: 0
- - _Letter_Row02_Col13_Byte0: 0
- - _Letter_Row02_Col14_Byte0: 0
- - _Letter_Row02_Col15_Byte0: 0
- - _Letter_Row02_Col16_Byte0: 0
- - _Letter_Row02_Col17_Byte0: 0
- - _Letter_Row02_Col18_Byte0: 0
- - _Letter_Row02_Col19_Byte0: 0
- - _Letter_Row02_Col20_Byte0: 0
- - _Letter_Row02_Col21_Byte0: 0
- - _Letter_Row02_Col22_Byte0: 0
- - _Letter_Row02_Col23_Byte0: 0
- - _Letter_Row02_Col24_Byte0: 0
- - _Letter_Row02_Col25_Byte0: 0
- - _Letter_Row02_Col26_Byte0: 0
- - _Letter_Row02_Col27_Byte0: 0
- - _Letter_Row02_Col28_Byte0: 0
- - _Letter_Row02_Col29_Byte0: 0
- - _Letter_Row02_Col30_Byte0: 0
- - _Letter_Row02_Col31_Byte0: 0
- - _Letter_Row02_Col32_Byte0: 0
- - _Letter_Row02_Col33_Byte0: 0
- - _Letter_Row02_Col34_Byte0: 0
- - _Letter_Row02_Col35_Byte0: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1