Commit eaa6bca

committed

Shaders & Others

sdkjgfqkwajshfbkj\shygbvfe

1 parent b3286f3 commit eaa6bcaCopy full SHA for eaa6bca

File tree

16 files changed

+45945

-155

lines changed

Native_Compilation_Project/Assets
- Camera/Scripts
  - CameraShake.cs
- Decals
  - Blood Decal.prefab
- Enemy/Materials
  - Enemy.mat
- Maps/Materials
  - Test Floor.mat
- Scenes
- Shaders.meta
- Shaders
  - New Shader Graph.shadergraph.meta
  - New Shader Graph.shadergraph
- Weapons/Prefabs

16 files changed

+45945

-155

lines changed

`‎Native_Compilation_Project/Assets/Camera/Scripts/CameraShake.cs`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ public class CameraShake : MonoBehaviour`
`7`	`7`	`{`
`8`	`8`	`public Camera cam;`
`9`	`9`	`public bool alreadyShaking;`
`10`		`- public Vector3 initPosition;`
	`10`	`+ //public Vector3 initPosition;`
	`11`	`+ public float initFOV;`
`11`	`12`	`public float timeToWait;`
`12`	`13`
`13`	`14`	`public void Start()`
`@@ -26,17 +27,20 @@ public void cameraShake(float length, float hardness)`
`26`	`27`	`private IEnumerator _ShakingCamera(float length, float hardness)`
`27`	`28`	`{`
`28`	`29`	`alreadyShaking = true;`
`29`		`- initPosition = cam.transform.position;`
	`30`	`+ //initPosition = cam.transform.position;`
	`31`	`+ initFOV = cam.fieldOfView;`
`30`	`32`
`31`	`33`	`float time = 0f;`
`32`	`34`	`while (time < length)`
`33`	`35`	`{`
`34`		`- cam.transform.localPosition = initPosition + (Vector3)Random.insideUnitCircle * hardness;`
	`36`	`+ cam.fieldOfView = cam.fieldOfView + Random.Range(-1f, 1f) * hardness;`
	`37`	`+ //cam.transform.position = cam.transform.position + (Vector3)Random.insideUnitCircle * hardness;`
`35`	`38`	`time += timeToWait;`
`36`	`39`	`yield return new WaitForSeconds(timeToWait);`
`37`	`40`	`}`
`38`	`41`
`39`		`- cam.transform.position = initPosition;`
	`42`	`+ //cam.transform.position = initPosition;`
	`43`	`+ cam.fieldOfView = initFOV;`
`40`	`44`	`alreadyShaking = false;`
`41`	`45`	`}`
`42`	`46`	`}`

`‎Native_Compilation_Project/Assets/Decals/Blood Decal.prefab`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ MonoBehaviour:`
`52`	`52`	`m_UVScale: {x: 1, y: 1}`
`53`	`53`	`m_UVBias: {x: 0, y: 0}`
`54`	`54`	`m_ScaleMode: 0`
`55`		`- m_Offset: {x: 0, y: 0, z: 0.5}`
`56`		`- m_Size: {x: 1, y: 1, z: 1}`
	`55`	`+ m_Offset: {x: 0, y: 0, z: 2.5}`
	`56`	`+ m_Size: {x: 3, y: 3, z: 5}`
`57`	`57`	`m_FadeFactor: 1`

`‎Native_Compilation_Project/Assets/Enemy/Materials/Enemy.mat`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ Material:`
`99`	`99`	`- _Parallax: 0.02`
`100`	`100`	`- _QueueOffset: 0`
`101`	`101`	`- _ReceiveShadows: 1`
	`102`	`+ - _ScrollSpeed: 1`
`102`	`103`	`- _Smoothness: 0.5`
`103`	`104`	`- _SmoothnessTextureChannel: 0`
`104`	`105`	`- _SpecularHighlights: 1`

`‎Native_Compilation_Project/Assets/Maps/Materials/Test Floor.mat`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,14 @@ Material:`
`8`	`8`	`m_PrefabInstance: {fileID: 0}`
`9`	`9`	`m_PrefabAsset: {fileID: 0}`
`10`	`10`	`m_Name: Test Floor`
`11`		`- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}`
	`11`	`+ m_Shader: {fileID: -6465566751694194690, guid: 8358dab8d928ac24caef6efe21a5362e, type: 3}`
`12`	`12`	`m_ValidKeywords: []`
`13`	`13`	`m_InvalidKeywords: []`
`14`	`14`	`m_LightmapFlags: 4`
`15`	`15`	`m_EnableInstancingVariants: 0`
`16`	`16`	`m_DoubleSidedGI: 0`
`17`		`- m_CustomRenderQueue: 2000`
`18`		`- stringTagMap:`
`19`		`- RenderType: Opaque`
	`17`	`+ m_CustomRenderQueue: -1`
	`18`	`+ stringTagMap: {}`
`20`	`19`	`disabledShaderPasses: []`
`21`	`20`	`m_SavedProperties:`
`22`	`21`	`serializedVersion: 3`
`@@ -94,10 +93,13 @@ Material:`
`94`	`93`	`- _Glossiness: 0`
`95`	`94`	`- _GlossyReflections: 0`
`96`	`95`	`- _Metallic: 0`
	`96`	`+ - _Middle: 0.001`
`97`	`97`	`- _OcclusionStrength: 1`
`98`	`98`	`- _Parallax: 0.005`
	`99`	`+ - _QueueControl: 0`
`99`	`100`	`- _QueueOffset: 0`
`100`	`101`	`- _ReceiveShadows: 1`
	`102`	`+ - _ScrollSpeed: 10`
`101`	`103`	`- _Smoothness: 0`
`102`	`104`	`- _SmoothnessTextureChannel: 0`
`103`	`105`	`- _SpecularHighlights: 1`
`@@ -108,6 +110,9 @@ Material:`
`108`	`110`	`m_Colors:`
`109`	`111`	`- _BaseColor: {r: 0.40000004, g: 0.41960788, b: 0.43921572, a: 1}`
`110`	`112`	`- _Color: {r: 0.40000004, g: 0.41960788, b: 0.43921572, a: 1}`
	`113`	`+ - _ColorBot: {r: 0.021567345, g: 1, b: 0, a: 1}`
	`114`	`+ - _ColorMid: {r: 0.4503576, g: 0.5754717, b: 0, a: 1}`
	`115`	`+ - _ColorTop: {r: 1, g: 0, b: 0, a: 1}`
`111`	`116`	`- _EmissionColor: {r: 0, g: 0.27058825, b: 0.7490196, a: 1}`
`112`	`117`	`- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}`
`113`	`118`	`m_BuildTextureStacks: []`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit eaa6bca

File tree

16 files changed

16 files changed

`‎Native_Compilation_Project/Assets/Camera/Scripts/CameraShake.cs`

`‎Native_Compilation_Project/Assets/Decals/Blood Decal.prefab`

`‎Native_Compilation_Project/Assets/Enemy/Materials/Enemy.mat`

`‎Native_Compilation_Project/Assets/Maps/Materials/Test Floor.mat`

0 commit comments