Mac fixes

This commit is contained in:
2022-11-17 12:09:26 -05:00
parent 29d652a6f0
commit c693d9c871
81 changed files with 694 additions and 796 deletions
@@ -1,76 +1,65 @@
Shader "QO/Sprite Sub" {
Properties {
_MainTex ("Base (RGBA)", 2D) = "white" {}
_Color ("Color", Color) = (1,1,1,1)
_UVWH ("UVWH", Vector) = (0,0,1,1)
}
SubShader {
LOD 200
Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
Pass {
Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
Blend SrcAlpha One
BlendOp RevSub
Program "vp" {
SubProgram "gles " {
"!!GLES
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
#ifdef VERTEX
varying lowp vec2 xlv_TEXCOORD0;
uniform highp vec4 _UVWH;
uniform highp mat4 glstate_matrix_mvp;
attribute vec4 _glesMultiTexCoord0;
attribute vec4 _glesVertex;
void main ()
Shader "QO/Sprite Sub"
{
lowp vec2 wh_1;
lowp vec2 uv_2;
lowp vec2 tmpvar_3;
highp vec2 tmpvar_4;
tmpvar_4 = _UVWH.xy;
uv_2 = tmpvar_4;
highp vec2 tmpvar_5;
tmpvar_5 = _UVWH.zw;
wh_1 = tmpvar_5;
highp vec2 tmpvar_6;
tmpvar_6 = ((_glesMultiTexCoord0.xy * wh_1) + uv_2);
tmpvar_3 = tmpvar_6;
gl_Position = (glstate_matrix_mvp * _glesVertex);
xlv_TEXCOORD0 = tmpvar_3;
}
Properties
{
_MainTex("Base (RGBA)", 2D) = "white" {}
_Color("Color", Color) = (1,1,1,1)
_UVWH("UVWH", Vector) = (0,0,1,1)
}
SubShader
{
LOD 200
Tags { "QUEUE" = "Transparent" "RenderType" = "Transparent" }
Pass {
Blend SrcAlpha OneMinusSrcAlpha
#endif
#ifdef FRAGMENT
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
varying lowp vec2 xlv_TEXCOORD0;
uniform highp vec4 _Color;
uniform sampler2D _MainTex;
void main ()
{
mediump vec4 tmpvar_1;
mediump vec4 texcol_2;
lowp vec4 tmpvar_3;
tmpvar_3 = texture2D (_MainTex, xlv_TEXCOORD0);
texcol_2 = tmpvar_3;
tmpvar_1 = (texcol_2 * _Color);
gl_FragData[0] = tmpvar_1;
}
#include "UnityCG.cginc"
sampler2D _MainTex;
half4 _Color;
float4 _UVWH;
struct appdata_t
{
float4 vertex : POSITION;
half4 color : COLOR;
float2 texcoord : TEXCOORD0;
};
#endif"
}
}
Program "fp" {
SubProgram "gles " {
"!!GLES"
}
}
}
}
Fallback "Diffuse"
struct v2f
{
float4 vertex : POSITION;
half4 color : COLOR;
float2 texcoord : TEXCOORD0;
};
v2f vert(appdata_t v)
{
v2f o;
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
half4 frag(v2f IN) : COLOR
{
float4 tex = tex2D(_MainTex, IN.texcoord);
float4 tmpvar_1 = (tex * _Color);
return tmpvar_1;
}
ENDCG
}
}
Fallback Off
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -35,7 +35,7 @@ public class Man2D : Singleton<Man2D>
this.CreateSpriteManager();
this.m_Texture = base.gameObject.AddComponent<ManTexture>();
this.CreateFrameBuffer();
this.m_BackSprite = this.AddSprite(string.Empty);
/*this.m_BackSprite = this.AddSprite(string.Empty);
this.m_BackSprite.z = 0;
this.m_BackSprite.w = this.m_nScreenW;
this.m_BackSprite.h = this.m_nScreenH;
@@ -43,7 +43,7 @@ public class Man2D : Singleton<Man2D>
this.m_BackSprite.G = 0;
this.m_BackSprite.B = 0;
this.m_BackSprite.A = byte.MaxValue;
this.m_BackSprite.Brend = SPRITE_DRAW_MODE.BACK;
this.m_BackSprite.Brend = SPRITE_DRAW_MODE.BACK;*/
base.enabled = false;
}
+2 -1
View File
@@ -21,7 +21,8 @@ public static class Pathing
{
get
{
return Pathing.appContentDataUri.ToString();
//return Pathing.appContentDataUri.ToString();
return "file://localhost/" + Application.streamingAssetsPath;
}
}