Skip to content

Commit

Permalink
Small update
Browse files Browse the repository at this point in the history
  • Loading branch information
@bentoBAUX
bentoBAUX committed Nov 3, 2024
1 parent cba4d78 commit 4e55584
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 17 deletions.
8 changes: 7 additions & 1 deletion .idea/.idea.Basic Lighting Models/.idea/workspace.xml
View file

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

58 changes: 49 additions & 9 deletions Assets/Scenes/Showcase.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ PrefabInstance:
propertyPath: m_Name
value: Gouraud-Phong
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Gouraud-Phong
Expand Down Expand Up @@ -674,6 +678,10 @@ PrefabInstance:
propertyPath: m_Name
value: Oren-Nayar
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Oren-Nayar
Expand Down Expand Up @@ -762,6 +770,10 @@ PrefabInstance:
propertyPath: m_Name
value: Lambert
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Lambertian
Expand Down Expand Up @@ -822,6 +834,14 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7456050666216733296, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8603294356248549131, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -932,12 +952,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 986719e287155884a9660c08fdbd3713, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 35
speed: 20
--- !u!1001 &757188510
PrefabInstance:
m_ObjectHideFlags: 0
Expand All @@ -954,6 +974,10 @@ PrefabInstance:
propertyPath: m_Name
value: Toon
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Toon
Expand Down Expand Up @@ -1235,23 +1259,23 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
materialsList:
- material: {fileID: 253864366}
- material: {fileID: 3898737}
colorProperty: _DiffuseColour
- material: {fileID: 1368670989}
- material: {fileID: 169834442}
colorProperty: _DiffuseColour
- material: {fileID: 37864301}
colorProperty: _DiffuseColour
- material: {fileID: 1725360005}
- material: {fileID: 1938904520}
colorProperty: _DiffuseColour
- material: {fileID: 1400564808}
- material: {fileID: 1368670989}
colorProperty: _DiffuseColour
- material: {fileID: 183294252}
colorProperty: _DiffuseColour
- material: {fileID: 169834442}
- material: {fileID: 253864366}
colorProperty: _DiffuseColour
- material: {fileID: 1938904520}
- material: {fileID: 1400564808}
colorProperty: _DiffuseColour
- material: {fileID: 3898737}
- material: {fileID: 1725360005}
colorProperty: _DiffuseColour
newColor: {r: 0.4830687, g: 0.83396226, b: 0.7111913, a: 1}
--- !u!114 &963194231
Expand Down Expand Up @@ -1520,6 +1544,10 @@ PrefabInstance:
propertyPath: m_Name
value: Flat Shading
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Flat
Expand Down Expand Up @@ -1604,6 +1632,10 @@ PrefabInstance:
propertyPath: m_Name
value: Unity Default
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Unity Default
Expand Down Expand Up @@ -1773,6 +1805,10 @@ PrefabInstance:
propertyPath: m_Name
value: Phong
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: 'Phong
Expand Down Expand Up @@ -1941,6 +1977,10 @@ PrefabInstance:
propertyPath: m_Name
value: Blinn-Phong
objectReference: {fileID: 0}
- target: {fileID: 2669199866070623933, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2939839369441636013, guid: f91bbf007e3b91b49965b52daf644270, type: 3}
propertyPath: m_text
value: Blinn-Phong
Expand Down
Binary file added Assets/Thumbnails/Icon Transparent.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Assets/Thumbnails/Icon Transparent.png.meta
View file

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

5 changes: 4 additions & 1 deletion ProjectSettings/EditorBuildSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/Scenes/Showcase.unity
guid: 56c7465974bc2d24dacd3476b1ede7f0
m_configObjects: {}
19 changes: 13 additions & 6 deletions ProjectSettings/ProjectSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: HLSL Test
companyName: bentoBAUX
productName: Basic Lighting Models in HLSL
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_ShowUnitySplashScreen: 0
m_ShowUnitySplashLogo: 0
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0
m_SplashScreenDrawMode: 1
m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1
m_SplashScreenBackgroundLandscapeAspect: 1
Expand Down Expand Up @@ -278,7 +278,14 @@ PlayerSettings:
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 597156b1fc254e64980abc54c18ecc8a, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching:
- m_BuildTarget: Standalone
Expand Down

0 comments on commit 4e55584

Please sign in to comment.