Pull request #4: Art/setupDimension1

Merge in CEGJ/creative-jam-20 from art/setupDimension1 to main

* commit '0ced9716a55f1509ebe3fcaf09547307342c1705':
  Test turret in art scene
  Put skyboxes into lfs Art folder
  progress on dimension1 planet look
This commit is contained in:
William Gingras 01 2022-05-14 03:22:10 +00:00
commit 9c5bde79d6
61 changed files with 2871 additions and 2749 deletions

BIN
Assets/Art/Materials/canons.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/canons/mat_dim1_canon2.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/canons/mat_dim1_canon2.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1_eye.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1_eye.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1_sphere.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/enemies/mat_enemy1_sphere.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1.mat (Stored with Git LFS)

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_2.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_2.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_back.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_back.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_clouds.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_clouds.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_shield.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_shield.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_water.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/Materials/mat_planet1_water.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/6sidedCosmicCoolCloud.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/6sidedCosmicCoolCloud.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/CosmicCoolCloud_Eq.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/CosmicCoolCloud_Eq.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/FreebieHdri.meta (Stored with Git LFS) Normal file

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.

BIN
Assets/Art/SkySeries Freebie/FreebieHdri/UnearthlyRed4k.hdr (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/Hdri setup.txt (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/Hdri setup.txt.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/PlanetaryEarth.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/PlanetaryEarth.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/UnearthlyRed.mat (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Art/SkySeries Freebie/UnearthlyRed.mat.meta (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 91b95a8dc23845f4eafddb8831f090fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3797647700142750130
MonoBehaviour:
m_ObjectHideFlags: 3
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: 0b2db86121404754db890f4c8dfe81b2, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
threshold:
m_OverrideState: 0
m_Value: 0.9
intensity:
m_OverrideState: 0
m_Value: 0
scatter:
m_OverrideState: 0
m_Value: 0.7
clamp:
m_OverrideState: 0
m_Value: 65472
tint:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
highQualityFiltering:
m_OverrideState: 0
m_Value: 0
skipIterations:
m_OverrideState: 0
m_Value: 1
dirtTexture:
m_OverrideState: 0
m_Value: {fileID: 0}
dirtIntensity:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-1545765389547952375
MonoBehaviour:
m_ObjectHideFlags: 3
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: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
m_Name: ColorAdjustments
m_EditorClassIdentifier:
active: 1
postExposure:
m_OverrideState: 1
m_Value: 2.78
contrast:
m_OverrideState: 1
m_Value: 20.7
colorFilter:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
hueShift:
m_OverrideState: 0
m_Value: 0
saturation:
m_OverrideState: 0
m_Value: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Global Volume (1) Profile
m_EditorClassIdentifier:
components:
- {fileID: -3797647700142750130}
- {fileID: -1545765389547952375}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 70d40178da90a4047abdcf8fc885ec14
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -13,45 +13,33 @@ MonoBehaviour:
m_Name: Bloom m_Name: Bloom
m_EditorClassIdentifier: m_EditorClassIdentifier:
active: 1 active: 1
m_AdvancedMode: 0
threshold: threshold:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1 m_Value: 1
min: 0
intensity: intensity:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1 m_Value: 1
min: 0
scatter: scatter:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0.7 m_Value: 0.7
min: 0
max: 1
clamp: clamp:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 65472 m_Value: 65472
min: 0
tint: tint:
m_OverrideState: 0 m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1} m_Value: {r: 1, g: 1, b: 1, a: 1}
hdr: 0
showAlpha: 0
showEyeDropper: 1
highQualityFiltering: highQualityFiltering:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0 m_Value: 0
skipIterations: skipIterations:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 1 m_Value: 1
min: 0
max: 16
dirtTexture: dirtTexture:
m_OverrideState: 0 m_OverrideState: 0
m_Value: {fileID: 0} m_Value: {fileID: 0}
dirtIntensity: dirtIntensity:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0 m_Value: 0
min: 0
--- !u!114 &-7011558710299706105 --- !u!114 &-7011558710299706105
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
@ -65,29 +53,67 @@ MonoBehaviour:
m_Name: Vignette m_Name: Vignette
m_EditorClassIdentifier: m_EditorClassIdentifier:
active: 1 active: 1
m_AdvancedMode: 0
color: color:
m_OverrideState: 0 m_OverrideState: 0
m_Value: {r: 0, g: 0, b: 0, a: 1} m_Value: {r: 0, g: 0, b: 0, a: 1}
hdr: 0
showAlpha: 0
showEyeDropper: 1
center: center:
m_OverrideState: 0 m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5} m_Value: {x: 0.5, y: 0.5}
intensity: intensity:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 0.25 m_Value: 0.25
min: 0
max: 1
smoothness: smoothness:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 0.4 m_Value: 0.4
min: 0.01
max: 1
rounded: rounded:
m_OverrideState: 0 m_OverrideState: 0
m_Value: 0 m_Value: 0
--- !u!114 &-5849591158115551007
MonoBehaviour:
m_ObjectHideFlags: 3
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: c01700fd266d6914ababb731e09af2eb, type: 3}
m_Name: DepthOfField
m_EditorClassIdentifier:
active: 0
mode:
m_OverrideState: 1
m_Value: 1
gaussianStart:
m_OverrideState: 1
m_Value: 0
gaussianEnd:
m_OverrideState: 1
m_Value: 373
gaussianMaxRadius:
m_OverrideState: 1
m_Value: 1
highQualitySampling:
m_OverrideState: 1
m_Value: 0
focusDistance:
m_OverrideState: 1
m_Value: 10
aperture:
m_OverrideState: 0
m_Value: 5.6
focalLength:
m_OverrideState: 0
m_Value: 50
bladeCount:
m_OverrideState: 0
m_Value: 5
bladeCurvature:
m_OverrideState: 0
m_Value: 1
bladeRotation:
m_OverrideState: 0
m_Value: 0
--- !u!114 &11400000 --- !u!114 &11400000
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -104,6 +130,7 @@ MonoBehaviour:
- {fileID: 849379129802519247} - {fileID: 849379129802519247}
- {fileID: -7893295128165547882} - {fileID: -7893295128165547882}
- {fileID: -7011558710299706105} - {fileID: -7011558710299706105}
- {fileID: -5849591158115551007}
--- !u!114 &849379129802519247 --- !u!114 &849379129802519247
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
@ -117,7 +144,6 @@ MonoBehaviour:
m_Name: Tonemapping m_Name: Tonemapping
m_EditorClassIdentifier: m_EditorClassIdentifier:
active: 1 active: 1
m_AdvancedMode: 0
mode: mode:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 1 m_Value: 1

View File

@ -22,6 +22,6 @@ MonoBehaviour:
lightLayerName6: Light Layer 6 lightLayerName6: Light Layer 6
lightLayerName7: Light Layer 7 lightLayerName7: Light Layer 7
m_StripDebugVariants: 1 m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 0 m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1 m_StripUnusedVariants: 1
supportRuntimeDebugDisplay: 0 supportRuntimeDebugDisplay: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6903a7f5903d0134d8083f162bf1e254 guid: 18dc0cd2c080841dea60987a38ce93fa
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

View File

@ -40,7 +40,7 @@ GraphicsSettings:
m_PreloadedShaders: [] m_PreloadedShaders: []
m_PreloadShadersBatchTimeLimit: -1 m_PreloadShadersBatchTimeLimit: -1
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_CustomRenderPipeline: {fileID: 11400000, guid: 681886c5eb7344803b6206f758bf0b1c, type: 2} m_CustomRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, type: 2}
m_TransparencySortMode: 0 m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_TransparencySortAxis: {x: 0, y: 0, z: 1}
m_DefaultRenderingPath: 1 m_DefaultRenderingPath: 1
@ -64,4 +64,4 @@ GraphicsSettings:
m_DefaultRenderingLayerMask: 1 m_DefaultRenderingLayerMask: 1
m_LogWhenShaderIsCompiled: 0 m_LogWhenShaderIsCompiled: 0
m_SRPDefaultSettings: m_SRPDefaultSettings:
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 6903a7f5903d0134d8083f162bf1e254, type: 2} UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}