Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HW4: Utkarsh Dwivedi #30

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b4c8c3d
initialize lfs
utkarshdwivedi3997 Nov 4, 2023
1f9d21c
updated toon shader for part 1
utkarshdwivedi3997 Nov 4, 2023
5fb61c1
fix blit bug
utkarshdwivedi3997 Nov 4, 2023
4f49ebd
basic sobel done
utkarshdwivedi3997 Nov 4, 2023
3a6551f
wups
utkarshdwivedi3997 Nov 4, 2023
4039e37
remove git lfs because i cant push to forks with lfs apparently
utkarshdwivedi3997 Nov 6, 2023
92e39b1
one big push with gerstner waves, dithering, scene 1, terrain, gamepl…
utkarshdwivedi3997 Nov 6, 2023
8e8c6e1
post process effect done(?). Need to do second scene and that should …
utkarshdwivedi3997 Nov 7, 2023
103d7ea
second scene setup done
utkarshdwivedi3997 Nov 7, 2023
a3e7f26
sun done
utkarshdwivedi3997 Nov 8, 2023
a215cdb
sun + light changes
utkarshdwivedi3997 Nov 8, 2023
0c86663
portal done
utkarshdwivedi3997 Nov 8, 2023
c4a13df
texture like Gris screen space watercolor effect
utkarshdwivedi3997 Nov 8, 2023
30dfa62
change all scene 1 colours because they looked ugly. More gris style …
utkarshdwivedi3997 Nov 8, 2023
5b3cc1a
loop done, noisy outlines done, ui elements added, everything is done
utkarshdwivedi3997 Nov 8, 2023
119f980
tweaks
utkarshdwivedi3997 Nov 8, 2023
1bfc523
readme started
utkarshdwivedi3997 Nov 8, 2023
4e246cc
readme progress
utkarshdwivedi3997 Nov 8, 2023
ebe0570
toon shading readme added
utkarshdwivedi3997 Nov 8, 2023
c5cad2c
readme outline portion progress
utkarshdwivedi3997 Nov 8, 2023
3de2060
dithering readme progress
utkarshdwivedi3997 Nov 9, 2023
ef04671
gerstner waves readme added
utkarshdwivedi3997 Nov 9, 2023
f15a4bc
portal readme done
utkarshdwivedi3997 Nov 9, 2023
d611221
readme vignette shader and animation curves progress
utkarshdwivedi3997 Nov 9, 2023
ed3f00f
readme progress
utkarshdwivedi3997 Nov 9, 2023
98f7d69
readme almost done
utkarshdwivedi3997 Nov 9, 2023
346ad85
done
utkarshdwivedi3997 Nov 9, 2023
ef5c078
added highlight gif
utkarshdwivedi3997 Nov 9, 2023
d1aadcc
Merge branch 'main' of https://github.com/utkarshdwivedi3997/cis566-h…
utkarshdwivedi3997 Nov 9, 2023
34e35fb
minor changes
utkarshdwivedi3997 Nov 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
55 changes: 55 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
## Unity ##

*.cs diff=csharp text
*.cginc text
*.shader text

*.mat merge=unityyamlmerge eol=lf
*.anim merge=unityyamlmerge eol=lf
*.unity merge=unityyamlmerge eol=lf
*.prefab merge=unityyamlmerge eol=lf
*.physicsMaterial2D merge=unityyamlmerge eol=lf
*.physicMaterial merge=unityyamlmerge eol=lf
*.asset merge=unityyamlmerge eol=lf
*.meta merge=unityyamlmerge eol=lf
*.controller merge=unityyamlmerge eol=lf


# ## git-lfs ##

# #Image
# *.jpg filter=lfs diff=lfs merge=lfs -text
# *.jpeg filter=lfs diff=lfs merge=lfs -text
# *.png filter=lfs diff=lfs merge=lfs -text
# *.gif filter=lfs diff=lfs merge=lfs -text
# *.psd filter=lfs diff=lfs merge=lfs -text
# *.ai filter=lfs diff=lfs merge=lfs -text

# #Audio
# *.mp3 filter=lfs diff=lfs merge=lfs -text
# *.wav filter=lfs diff=lfs merge=lfs -text
# *.ogg filter=lfs diff=lfs merge=lfs -text

# #Video
# *.mp4 filter=lfs diff=lfs merge=lfs -text
# *.mov filter=lfs diff=lfs merge=lfs -text

# #3D Object
# *.FBX filter=lfs diff=lfs merge=lfs -text
# *.fbx filter=lfs diff=lfs merge=lfs -text
# *.blend filter=lfs diff=lfs merge=lfs -text
# *.obj filter=lfs diff=lfs merge=lfs -text

# #ETC
# *.a filter=lfs diff=lfs merge=lfs -text
# *.exr filter=lfs diff=lfs merge=lfs -text
# *.tga filter=lfs diff=lfs merge=lfs -text
# *.pdf filter=lfs diff=lfs merge=lfs -text
# *.zip filter=lfs diff=lfs merge=lfs -text
# *.dll filter=lfs diff=lfs merge=lfs -text
# *.unitypackage filter=lfs diff=lfs merge=lfs -text
# *.aif filter=lfs diff=lfs merge=lfs -text
# *.ttf filter=lfs diff=lfs merge=lfs -text
# *.rns filter=lfs diff=lfs merge=lfs -text
# *.reason filter=lfs diff=lfs merge=lfs -text
# *.lxo filter=lfs diff=lfs merge=lfs -text
40 changes: 40 additions & 0 deletions Assets/Buffers/NoisyNormalsBuffer.renderTexture
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NoisyNormalsBuffer
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 94
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_EnableRandomWrite: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2
8 changes: 8 additions & 0 deletions Assets/Buffers/NoisyNormalsBuffer.renderTexture.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Fonts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,128 changes: 1,128 additions & 0 deletions Assets/Fonts/EatnCake SDF.asset

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Fonts/EatnCake SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Fonts/EatnCake.ttf
Binary file not shown.
21 changes: 21 additions & 0 deletions Assets/Fonts/EatnCake.ttf.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

544 changes: 544 additions & 0 deletions Assets/Fonts/animeace SDF.asset

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Fonts/animeace SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Fonts/animeace.ttf
Binary file not shown.
21 changes: 21 additions & 0 deletions Assets/Fonts/animeace.ttf.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions Assets/Materials/Mat_DoorFrameHull.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6253849026873623099
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Mat_DoorFrameHull
m_Shader: {fileID: -6465566751694194690, guid: d06cb6a79e645b145b89d6f333236ab6,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _QueueControl: 0
- _QueueOffset: 0
- _Thickness: 0.8
m_Colors: []
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/Mat_DoorFrameHull.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 100 additions & 0 deletions Assets/Materials/Mat_Portal.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Mat_Portal
m_Shader: {fileID: -6465566751694194690, guid: 9556862c000594f45a97db265bb05839,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MidtoneTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Normal:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ShadowTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS: 0
- ADDITIONAL_LIGHT_CALCULATE_SHADOWS_1: 0
- MAIN_LIGHT_CALCULATE_SHADOWS: 0
- _DistortionIntensity: 0
- _DistortionSpeed: 1
- _FresnelPower: 1
- _MAIN_LIGHT_SHADOWS_CASCADE: 0
- _MidtoneTextureRotation: 0.5
- _MidtoneThreshold: 0.7
- _QueueControl: 0
- _QueueOffset: 0
- _SHADOWS_SOFT: 0
- _ShadowTextureRotation: -1
- _ShadowThreshold: 0.5
- _XDistortion: 0
- _YDistortion: 0
m_Colors:
- _AdditionalLightsRampedDiffuseValues: {r: 0.2, g: 0.5, b: 1, a: 0}
- _MainColor: {r: 0.46603763, g: 1, b: 0.4881814, a: 1}
- _MainTextureTiling: {r: 1, g: 1, b: 0, a: 0}
- _MidtoneTextureTiling: {r: 5, g: 5, b: 0, a: 0}
- _ShadowColor: {r: 0.20270556, g: 0.36792448, b: 0.20877975, a: 1}
- _ShadowTextureTiling: {r: 5, g: 5, b: 0, a: 0}
- _XYDistortion: {r: 0.3, g: 0.61, b: 0, a: 0}
- _XYScrollSpeed: {r: 1, g: 1, b: 0, a: 0}
- _XYTiling: {r: 5, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &4624206441623968533
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/Materials/Mat_Portal.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading