diff options
| author | yum <yum.food.vr@gmail.com> | 2023-01-27 16:14:07 -0800 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2023-01-27 16:14:07 -0800 |
| commit | 45301ff0c0d732c3bf93f0a324e821a5f67f468c (patch) | |
| tree | 6bea0a3cf67e2de63a22c353155d1a0570742125 | |
| parent | 30680445b1c59fe107a0be8295da2b8a38c0f6ea (diff) | |
Bugfixesv0.4.0
* Fix prefab: bounding box & position are now set to 0
* Fix shader: text is no longer upside down
* Update README
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | Scripts/generate_params.py | 2 | ||||
| -rw-r--r-- | Shaders/TaSTT_lighting_template.cginc | 3 | ||||
| -rw-r--r-- | UnityAssets/World Constraint.prefab | 68 |
4 files changed, 40 insertions, 36 deletions
@@ -48,7 +48,8 @@ Basic controls: * Customizable: * Control button may be set to left/right a/b/joystick. * Text color, background color, and border color are customizable in the shader. - * Text background may be an image. + * Text background may be customized with PBR textures: base color, normal, + metallic, roughness, and emission are all implemented. * Border width and rounding are customizable. * Shader supports physically based shading: smoothness, metallic, and emissive. * Works with the built-in chatbox (usable with public avatars!) diff --git a/Scripts/generate_params.py b/Scripts/generate_params.py index 5deb17d..badccc2 100644 --- a/Scripts/generate_params.py +++ b/Scripts/generate_params.py @@ -65,7 +65,7 @@ def generate(): result += generate_utils.replaceMacros(BOOL_PARAM, params) params["PARAM_NAME"] = generate_utils.getScaleParam() - params["DEFAULT_FLOAT"] = "0.2" + params["DEFAULT_FLOAT"] = "0.1" result += generate_utils.replaceMacros(FLOAT_PARAM, params) params["DEFAULT_FLOAT"] = "0" diff --git a/Shaders/TaSTT_lighting_template.cginc b/Shaders/TaSTT_lighting_template.cginc index e3b6239..ffdd7c5 100644 --- a/Shaders/TaSTT_lighting_template.cginc +++ b/Shaders/TaSTT_lighting_template.cginc @@ -504,6 +504,9 @@ bool f3ltf3(fixed3 a, fixed3 b) fixed4 frag(v2f i) : SV_Target { float2 uv = i.uv.zw; + // Fix text orientation + uv.y = 0.5 - uv.y; + uv.x = 1.0 - uv.x; uv.y *= 2; // Text box has 2:1 aspect ratio // Derived from github.com/pema99/shader-knowledge (MIT license). diff --git a/UnityAssets/World Constraint.prefab b/UnityAssets/World Constraint.prefab index fcd9f08..6831941 100644 --- a/UnityAssets/World Constraint.prefab +++ b/UnityAssets/World Constraint.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &333326771971973088 +--- !u!1 &6662325495449796574 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 333326771971973091} + - component: {fileID: 6662325495449796573} m_Layer: 0 m_Name: Reset Target m_TagString: Untagged @@ -16,21 +16,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &333326771971973091 +--- !u!4 &6662325495449796573 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 333326771971973088} + m_GameObject: {fileID: 6662325495449796574} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2340054242077080793} + m_Father: {fileID: 8695581977798122727} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2336530621960451765 +--- !u!1 &8698814191224624779 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -38,8 +38,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2340054242077080793} - - component: {fileID: 6710145964583806056} + - component: {fileID: 8695581977798122727} + - component: {fileID: 417244186381485142} m_Layer: 0 m_Name: World Constraint m_TagString: Untagged @@ -47,29 +47,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2340054242077080793 +--- !u!4 &8695581977798122727 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2336530621960451765} + m_GameObject: {fileID: 8698814191224624779} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2335074273637216033} - - {fileID: 333326771971973091} + - {fileID: 8697219428738715423} + - {fileID: 6662325495449796573} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1773428102 &6710145964583806056 +--- !u!1773428102 &417244186381485142 ParentConstraint: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2336530621960451765} + m_GameObject: {fileID: 8698814191224624779} m_Enabled: 1 m_Weight: 1 m_TranslationAtRest: {x: 0, y: 0, z: 0} @@ -90,7 +90,7 @@ ParentConstraint: - sourceTransform: {fileID: 1720321125886419532, guid: e86e0e4bebce5834ab8ed64ac5f3b3cc, type: 3} weight: 1 ---- !u!1 &2337265044047023141 +--- !u!1 &8699478381752232987 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -98,8 +98,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2335074273637216033} - - component: {fileID: 2337265044047023142} + - component: {fileID: 8697219428738715423} + - component: {fileID: 8699478381752232984} m_Layer: 0 m_Name: Container m_TagString: Untagged @@ -107,28 +107,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2335074273637216033 +--- !u!4 &8697219428738715423 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2337265044047023141} + m_GameObject: {fileID: 8699478381752232987} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3660753880371151432} - m_Father: {fileID: 2340054242077080793} + - {fileID: 2765901449544132873} + m_Father: {fileID: 8695581977798122727} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1773428102 &2337265044047023142 +--- !u!1773428102 &8699478381752232984 ParentConstraint: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2337265044047023141} + m_GameObject: {fileID: 8699478381752232987} m_Enabled: 1 m_Weight: 1 m_TranslationAtRest: {x: 0, y: 0, z: 0} @@ -146,14 +146,14 @@ ParentConstraint: m_IsContraintActive: 1 m_IsLocked: 1 m_Sources: - - sourceTransform: {fileID: 333326771971973091} + - sourceTransform: {fileID: 6662325495449796573} weight: 1 ---- !u!1001 &3839078161062733219 +--- !u!1001 &2443429072721514210 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2335074273637216033} + m_TransformParent: {fileID: 8697219428738715423} m_Modifications: - target: {fileID: -8679921383154817045, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} @@ -218,32 +218,32 @@ PrefabInstance: - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Center.x - value: -0.0064999997 + value: -0.010000006 objectReference: {fileID: 0} - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Center.y - value: 0.0000050016897 + value: 0.000005007014 objectReference: {fileID: 0} - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Center.z - value: 0.013751939 + value: 0.0050000395 objectReference: {fileID: 0} - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Extent.x - value: 0.0049999994 + value: 0.009999999 objectReference: {fileID: 0} - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Extent.y - value: 0.000025001036 + value: 0.000050002658 objectReference: {fileID: 0} - target: {fileID: -3887185075125053422, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} propertyPath: m_AABB.m_Extent.z - value: 0.002500012 + value: 0.005000021 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} @@ -252,9 +252,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} ---- !u!4 &3660753880371151432 stripped +--- !u!4 &2765901449544132873 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3} - m_PrefabInstance: {fileID: 3839078161062733219} + m_PrefabInstance: {fileID: 2443429072721514210} m_PrefabAsset: {fileID: 0} |
