672 FlowerOfDeathUNITY/Assets/Models/Character/new_character_skipping_animation.fbx.meta
View file

Large diffs are not rendered by default.

2,263 FlowerOfDeathUNITY/Assets/Scenes/TESSDEMO1.unity
View file

Large diffs are not rendered by default.

105 FlowerOfDeathUNITY/Assets/Scripts/Wind.cs
View file
@@ -3,6 +3,8 @@

public class Wind : MonoBehaviour {

public Transform player;

public Texture2D mask1;
public Texture2D mask2;

@@ -23,7 +25,7 @@ public class Wind : MonoBehaviour {

public Shader treeShader;

float time = 0;
float time = 1;
public float timeFactor = 1f;
//float lerptime

@@ -32,19 +34,35 @@ public class Wind : MonoBehaviour {

public GameObject debugRender;

[Header("Wind Settings")]
public string WindMapName = "_WindMap";
public string WindMapScaleName = "_WindMapScale";
public float WindMapScale = 1000f;
public int WindMapResolutionX, WindMapResolutionY;
public float noiseScale = 0.05f;
public string PlayerWindName = "_PlayerWind";
public string PlayerPosName = "_PlayerPos";

Color[,] windMapData;
Color[,] playerWindData;
int playerWindRes = 8;
Texture2D playerWind;

// Use this for initialization
void Start () {

windTexture = new Texture2D(100, 100);
windMapData = new Color[WindMapResolutionX,WindMapResolutionY];
playerWindData = new Color[playerWindRes, playerWindRes];

playerWind = new Texture2D(playerWindRes, playerWindRes);
windTexture = new Texture2D(WindMapResolutionX, WindMapResolutionY);

Vector4 newWind = new Vector4(wind.x,wind.y,wind.z,windStrength.Evaluate(time));

windNow = wind;

WindPreWarm();

//SimpleWindPreWarm();

//treeShader.SetGlobalVector("_Wind", wind);
@@ -76,9 +94,10 @@ public class Wind : MonoBehaviour {
Shader.SetGlobalTexture(WindMapName, windTexture);
Shader.SetGlobalFloat(WindMapScaleName, WindMapScale);

SimpleWind2();

debugRender.renderer.material.SetTexture("_MainTex", windTexture);

WindUpdate();
PlayerWind();
debugRender.renderer.material.SetTexture("_MainTex", playerWind);


}
@@ -154,4 +173,80 @@ public class Wind : MonoBehaviour {

}

void WindPreWarm() {
Color tempC = new Color(0,0,0);
//float time = Time.time+1;

time = 0.1f;

for (int x = WindMapResolutionX - 1; x >= 0; x--) {
float xc = x*noiseScale;
for (int y = WindMapResolutionY - 1; y >= 0; y--) {
tempC.r = Mathf.PerlinNoise(time + xc, time + y*noiseScale);
//Debug.Log(Mathf.PerlinNoise(time + x, time+y));
windMapData[x, y] = tempC;

windTexture.SetPixel(x, y, windMapData[x, y]);

}
}
windTexture.Apply();
}

void WindUpdate() {

Color tempC = new Color(0,0,0);
for (int y = WindMapResolutionY -1; y >= 0; y--) {
tempC.r = Mathf.PerlinNoise(0, Time.time + y*noiseScale);
//tempC.g = Mathf.PerlinNoise(0, Time.time+5 + y * noiseScale);
tempC.b = Mathf.PerlinNoise(0, Time.time+10 + y * noiseScale);

windMapData[0,y] = tempC;
}

for (int x = WindMapResolutionX - 1; x > 0; x--) {
for (int y = WindMapResolutionY - 1; y >= 0; y--) {
windMapData[x, y] = windMapData[x - 1, y];
windTexture.SetPixel(x, y, windMapData[x, y]);

}
}
/*
Color tempC = new Color(0, 0, 0);
for (int x = WindMapResolutionX - 1; x >= 0; x--) {
for (int y = WindMapResolutionY - 1; y >= 0; y--) {
tempC.r = Mathf.PerlinNoise(Time.time + x * noiseScale, y*noiseScale);
windMapData[x, y] = tempC;
windTexture.SetPixel(x, y, windMapData[x, y]);
}
}*/

windTexture.Apply();
}

void PlayerWind() {

Vector4 ppos = new Vector4(player.position.x, player.position.y, player.position.z, 0);

for (int x = playerWindRes - 1; x >= 0; x--) {
for (int y = playerWindRes - 1; y >= 0; y--) {
playerWindData[x, y] = Color.black;

playerWind.SetPixel(x, y, playerWindData[x, y]);
}
}

int coord = playerWindRes / 2;
playerWindData[coord, coord] = Color.red;
playerWind.SetPixel(coord, coord, playerWindData[coord, coord]);

playerWind.Apply();

Shader.SetGlobalVector(PlayerPosName, ppos);
Shader.SetGlobalTexture(PlayerWindName, playerWind);

}

}
82 FlowerOfDeathUNITY/Assets/Shaders/TessGrass.shader
View file

Large diffs are not rendered by default.

10 FlowerOfDeathUNITY/Assets/Shaders/WaterTest.mat
View file
@@ -24,7 +24,7 @@ Material:
first:
name: _Normal
second:
m_Texture: {fileID: 2800000, guid: cf20bfced7e912046a9ce991a4d775ec, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 5, y: 5}
m_Offset: {x: 0, y: 0}
m_Floats:
@@ -35,11 +35,11 @@ Material:
data:
first:
name: _Fresnel
second: 14.6700001
second: 1
data:
first:
name: _DepthBlend
second: 4
second: 12.8000002
m_Colors:
data:
first:
@@ -48,8 +48,8 @@ Material:
data:
first:
name: _Tint
second: {r: .59493947, g: .963235319, b: .947995424, a: 1}
second: {r: .197448105, g: .610294104, b: .38821137, a: 1}
data:
first:
name: _ShoreTint
second: {r: .117241383, g: 0, b: 1, a: 1}
second: {r: 0, g: .0145030003, b: .161764681, a: 1}
19 FlowerOfDeathUNITY/Assets/Shaders/WetShitstain.shader
View file
@@ -1,7 +1,7 @@
// Shader created with Shader Forge v1.02
// Shader Forge (c) Neat Corporation / Joachim Holmer - http://www.acegikmo.com/shaderforge/
// Note: Manually altering this data may prevent you from opening it in Shader Forge
/*SF_DATA;ver:1.02;sub:START;pass:START;ps:flbk:,lico:1,lgpr:1,nrmq:1,limd:1,uamb:True,mssp:True,lmpd:False,lprd:False,rprd:False,enco:False,frtr:True,vitr:True,dbil:False,rmgx:True,rpth:0,hqsc:True,hqlp:False,tesm:0,blpr:1,bsrc:3,bdst:7,culm:0,dpts:2,wrdp:False,ufog:True,aust:True,igpj:True,qofs:0,qpre:3,rntp:2,fgom:False,fgoc:False,fgod:False,fgor:False,fgmd:0,fgcr:0.5,fgcg:0.5,fgcb:0.5,fgca:1,fgde:0.01,fgrn:0,fgrf:300,ofsf:0,ofsu:0,f2p0:False;n:type:ShaderForge.SFN_Final,id:1692,x:32719,y:32712,varname:node_1692,prsc:2|normal-522-RGB,emission-3073-OUT,alpha-512-OUT;n:type:ShaderForge.SFN_Color,id:2882,x:31831,y:32717,ptovrint:False,ptlb:Tint,ptin:_Tint,varname:node_2882,prsc:2,glob:False,c1:0.9338235,c2:0.3776492,c3:0.3776492,c4:1;n:type:ShaderForge.SFN_Color,id:5863,x:31831,y:32877,ptovrint:False,ptlb:ShoreTint,ptin:_ShoreTint,varname:node_5863,prsc:2,glob:False,c1:0.5,c2:0.5,c3:0.5,c4:1;n:type:ShaderForge.SFN_DepthBlend,id:2386,x:31606,y:33194,varname:node_2386,prsc:2|DIST-8089-OUT;n:type:ShaderForge.SFN_SceneDepth,id:5493,x:32118,y:33374,varname:node_5493,prsc:2;n:type:ShaderForge.SFN_ValueProperty,id:8089,x:31341,y:33155,ptovrint:False,ptlb:DepthBlend,ptin:_DepthBlend,varname:node_8089,prsc:2,glob:False,v1:15;n:type:ShaderForge.SFN_Multiply,id:1539,x:31988,y:33054,varname:node_1539,prsc:2|A-3789-OUT,B-2386-OUT;n:type:ShaderForge.SFN_OneMinus,id:512,x:32458,y:33098,varname:node_512,prsc:2|IN-7720-OUT;n:type:ShaderForge.SFN_Lerp,id:3073,x:32228,y:32784,varname:node_3073,prsc:2|A-2882-RGB,B-5863-RGB,T-2386-OUT;n:type:ShaderForge.SFN_Fresnel,id:4835,x:31029,y:33002,varname:node_4835,prsc:2|EXP-9472-OUT;n:type:ShaderForge.SFN_ValueProperty,id:9472,x:31011,y:32844,ptovrint:False,ptlb:Fresnel,ptin:_Fresnel,varname:node_9472,prsc:2,glob:False,v1:3;n:type:ShaderForge.SFN_Tex2d,id:522,x:32184,y:32497,ptovrint:False,ptlb:Normal,ptin:_Normal,varname:node_522,prsc:2,ntxv:3,isnm:False;n:type:ShaderForge.SFN_OneMinus,id:4560,x:31158,y:33170,varname:node_4560,prsc:2|IN-4835-OUT;n:type:ShaderForge.SFN_ViewVector,id:4344,x:31459,y:32640,varname:node_4344,prsc:2;n:type:ShaderForge.SFN_NormalVector,id:5330,x:31405,y:32829,prsc:2,pt:False;n:type:ShaderForge.SFN_Dot,id:611,x:31628,y:32839,varname:node_611,prsc:2,dt:1|A-4344-OUT,B-5330-OUT;n:type:ShaderForge.SFN_Exp,id:8985,x:31257,y:33388,varname:node_8985,prsc:2,et:0;n:type:ShaderForge.SFN_Power,id:8634,x:31300,y:32600,varname:node_8634,prsc:2|VAL-611-OUT,EXP-9472-OUT;n:type:ShaderForge.SFN_Vector1,id:5294,x:32326,y:33419,varname:node_5294,prsc:2,v1:0;n:type:ShaderForge.SFN_RemapRange,id:7720,x:32231,y:33069,varname:node_7720,prsc:2,frmn:0,frmx:1,tomn:0.2,tomx:1|IN-1539-OUT;n:type:ShaderForge.SFN_Multiply,id:3789,x:31488,y:33059,varname:node_3789,prsc:2|A-611-OUT,B-9472-OUT;proporder:8089-2882-5863-9472-522;pass:END;sub:END;*/
/*SF_DATA;ver:1.02;sub:START;pass:START;ps:flbk:,lico:1,lgpr:1,nrmq:1,limd:1,uamb:True,mssp:True,lmpd:False,lprd:False,rprd:False,enco:False,frtr:True,vitr:True,dbil:False,rmgx:True,rpth:0,hqsc:True,hqlp:False,tesm:0,blpr:1,bsrc:3,bdst:7,culm:0,dpts:2,wrdp:False,ufog:True,aust:False,igpj:True,qofs:0,qpre:4,rntp:2,fgom:False,fgoc:False,fgod:False,fgor:False,fgmd:0,fgcr:0.5,fgcg:0.5,fgcb:0.5,fgca:1,fgde:0.01,fgrn:0,fgrf:300,ofsf:0,ofsu:0,f2p0:False;n:type:ShaderForge.SFN_Final,id:1692,x:32719,y:32712,varname:node_1692,prsc:2|normal-522-RGB,emission-3073-OUT,alpha-5294-OUT;n:type:ShaderForge.SFN_Color,id:2882,x:31831,y:32717,ptovrint:False,ptlb:Tint,ptin:_Tint,varname:_Tint,prsc:2,glob:False,c1:0.9338235,c2:0.3776492,c3:0.3776492,c4:1;n:type:ShaderForge.SFN_Color,id:5863,x:31831,y:32877,ptovrint:False,ptlb:ShoreTint,ptin:_ShoreTint,varname:_ShoreTint,prsc:2,glob:False,c1:0.5,c2:0.5,c3:0.5,c4:1;n:type:ShaderForge.SFN_DepthBlend,id:2386,x:31655,y:33240,varname:node_2386,prsc:2|DIST-8089-OUT;n:type:ShaderForge.SFN_SceneDepth,id:5493,x:32118,y:33374,varname:node_5493,prsc:2;n:type:ShaderForge.SFN_ValueProperty,id:8089,x:31455,y:33388,ptovrint:False,ptlb:DepthBlend,ptin:_DepthBlend,varname:_DepthBlend,prsc:2,glob:False,v1:15;n:type:ShaderForge.SFN_Multiply,id:1539,x:31988,y:33054,varname:node_1539,prsc:2|A-3789-OUT,B-2386-OUT;n:type:ShaderForge.SFN_OneMinus,id:512,x:32458,y:33098,varname:node_512,prsc:2|IN-7720-OUT;n:type:ShaderForge.SFN_Lerp,id:3073,x:32228,y:32784,varname:node_3073,prsc:2|A-2882-RGB,B-5863-RGB,T-2386-OUT;n:type:ShaderForge.SFN_Fresnel,id:4835,x:31029,y:33002,varname:node_4835,prsc:2|EXP-9472-OUT;n:type:ShaderForge.SFN_ValueProperty,id:9472,x:31011,y:32844,ptovrint:False,ptlb:Fresnel,ptin:_Fresnel,varname:_Fresnel,prsc:2,glob:False,v1:3;n:type:ShaderForge.SFN_Tex2d,id:522,x:32184,y:32497,ptovrint:False,ptlb:Normal,ptin:_Normal,varname:_Normal,prsc:2,ntxv:3,isnm:False;n:type:ShaderForge.SFN_OneMinus,id:4560,x:31158,y:33170,varname:node_4560,prsc:2|IN-4835-OUT;n:type:ShaderForge.SFN_ViewVector,id:4344,x:31405,y:32746,varname:node_4344,prsc:2;n:type:ShaderForge.SFN_NormalVector,id:5330,x:31405,y:32871,prsc:2,pt:False;n:type:ShaderForge.SFN_Dot,id:611,x:31618,y:32842,varname:node_611,prsc:2,dt:1|A-4344-OUT,B-5330-OUT;n:type:ShaderForge.SFN_Exp,id:8985,x:31257,y:33388,varname:node_8985,prsc:2,et:0;n:type:ShaderForge.SFN_Power,id:8634,x:31346,y:32502,varname:node_8634,prsc:2|VAL-611-OUT,EXP-9472-OUT;n:type:ShaderForge.SFN_Vector1,id:5294,x:32304,y:32951,varname:node_5294,prsc:2,v1:1;n:type:ShaderForge.SFN_RemapRange,id:7720,x:32231,y:33069,varname:node_7720,prsc:2,frmn:0,frmx:1,tomn:0.2,tomx:1|IN-1539-OUT;n:type:ShaderForge.SFN_Multiply,id:3789,x:31488,y:33059,varname:node_3789,prsc:2|A-611-OUT,B-9472-OUT;proporder:8089-2882-5863-9472-522;pass:END;sub:END;*/

Shader "Cloisterlife/WetShitstain" {
Properties {
@@ -15,7 +15,7 @@ Shader "Cloisterlife/WetShitstain" {
SubShader {
Tags {
"IgnoreProjector"="True"
"Queue"="Transparent"
"Queue"="Overlay"
"RenderType"="Transparent"
}
Pass {
@@ -38,7 +38,6 @@ Shader "Cloisterlife/WetShitstain" {
uniform float4 _Tint;
uniform float4 _ShoreTint;
uniform float _DepthBlend;
uniform float _Fresnel;
uniform sampler2D _Normal; uniform float4 _Normal_ST;
struct VertexInput {
float4 vertex : POSITION;
@@ -49,19 +48,17 @@ Shader "Cloisterlife/WetShitstain" {
struct VertexOutput {
float4 pos : SV_POSITION;
float2 uv0 : TEXCOORD0;
float4 posWorld : TEXCOORD1;
float3 normalDir : TEXCOORD2;
float3 tangentDir : TEXCOORD3;
float3 binormalDir : TEXCOORD4;
float4 projPos : TEXCOORD5;
float3 normalDir : TEXCOORD1;
float3 tangentDir : TEXCOORD2;
float3 binormalDir : TEXCOORD3;
float4 projPos : TEXCOORD4;
};
VertexOutput vert (VertexInput v) {
VertexOutput o;
o.uv0 = v.texcoord0;
o.normalDir = mul(_Object2World, float4(v.normal,0)).xyz;
o.tangentDir = normalize( mul( _Object2World, float4( v.tangent.xyz, 0.0 ) ).xyz );
o.binormalDir = normalize(cross(o.normalDir, o.tangentDir) * v.tangent.w);
o.posWorld = mul(_Object2World, v.vertex);
o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
o.projPos = ComputeScreenPos (o.pos);
COMPUTE_EYEDEPTH(o.projPos.z);
@@ -73,7 +70,6 @@ Shader "Cloisterlife/WetShitstain" {
float partZ = max(0,i.projPos.z - _ProjectionParams.g);
float3x3 tangentTransform = float3x3( i.tangentDir, i.binormalDir, i.normalDir);
/////// Vectors:
float3 viewDirection = normalize(_WorldSpaceCameraPos.xyz - i.posWorld.xyz);
float4 _Normal_var = tex2D(_Normal,TRANSFORM_TEX(i.uv0, _Normal));
float3 normalLocal = _Normal_var.rgb;
float3 normalDirection = normalize(mul( normalLocal, tangentTransform )); // Perturbed normals
@@ -82,8 +78,7 @@ Shader "Cloisterlife/WetShitstain" {
float node_2386 = saturate((sceneZ-partZ)/_DepthBlend);
float3 emissive = lerp(_Tint.rgb,_ShoreTint.rgb,node_2386);
float3 finalColor = emissive;
float node_611 = max(0,dot(viewDirection,i.normalDir));
return fixed4(finalColor,(1.0 - (((node_611*_Fresnel)*node_2386)*0.8+0.2)));
return fixed4(finalColor,1.0);
}
ENDCG
}
40 FlowerOfDeathUNITY/Assets/Shaders/tessTest.mat
View file
@@ -8,7 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: tessTest
m_Shader: {fileID: 4800000, guid: 20b2c53a5daf633439dcef3f3afa22b6, type: 3}
m_ShaderKeywords: []
m_ShaderKeywords:
- _TEST_ON
m_CustomRenderQueue: -1
m_SavedProperties:
serializedVersion: 2
@@ -83,15 +84,26 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
data:
first:
name: _LastSplat
second:
m_Texture: {fileID: 2800000, guid: c21e1d3c7015f0d4fb28cf936171e9b7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
data:
first:
name: _Cutoff
second: .5
data:
first:
name: _Offset
second: .400000006
second: .300000012
data:
first:
name: _Fresnel
second: 1.95000005
second: 1.89999998
data:
first:
name: _distExp
@@ -108,11 +120,31 @@ Material:
first:
name: _Tesselation
second: 55
data:
first:
name: _test
second: 1
data:
first:
name: _node_7780
second: 0
data:
first:
name: _node_9759
second: 0
data:
first:
name: _lr
second: .819999993
data:
first:
name: _tr
second: 4
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _Color2
47 FlowerOfDeathUNITY/Assets/Textures/Vegetation/fur7.tga.meta
View file
BIN +0 Bytes (100%) FlowerOfDeathUNITY/Assets/labterrain.asset
View file
Binary file not shown.
2 FlowerOfDeathUNITY/FlowerOfDeathUNITY-csharp.sln
View file
@@ -29,7 +29,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
=======
GlobalSection(MonoDevelopProperties) = preSolution
>>>>>>> origin/master
2 FlowerOfDeathUNITY/FlowerOfDeathUNITY.sln
View file
@@ -41,7 +41,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
=======
GlobalSection(MonoDevelopProperties) = preSolution
>>>>>>> origin/master
4 FlowerOfDeathUNITY/ProjectSettings/InputManager.asset
View file
@@ -15,7 +15,7 @@ InputManager:
altPositiveButton: d
gravity: 6
dead: .00100000005
sensitivity: 6
sensitivity: 1
snap: 1
invert: 0
type: 0
@@ -31,7 +31,7 @@ InputManager:
altPositiveButton: w
gravity: 6
dead: .00100000005
sensitivity: 6
sensitivity: 1
snap: 1
invert: 0
type: 0
BIN -9 KB (81%) FlowerOfDeathUNITY/UnityVS.FlowerOfDeathUNITY.v12.suo
View file
Binary file not shown.