kforney/gimm270_07_photogallery
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Finish and polish.

Browse source
This commit is contained in:
Kaj Forney 2022-09-19 00:37:00 -06:00
parent 34c18ddcd7
commit c3159fd4b8
Signed by: kforney
GPG key ID: 3AB4E2E04CEF656F
15 changed files with 482 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.idea/.idea.gimm270_07_photoGallery/.idea/discord.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DiscordProjectSettings">
<option name="show" value="PROJECT" />
<option name="description" value="" />
</component>
</project>

8
.idea/.idea.gimm270_07_photoGallery/.idea/indexLayout.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

6
.idea/.idea.gimm270_07_photoGallery/.idea/projectSettingsUpdater.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="vcsConfiguration" value="2" />
</component>
</project>

6
.idea/.idea.gimm270_07_photoGallery/.idea/vcs.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

55
.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml
View file

@ -5,10 +5,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4a1232c8-16f5-4a95-9e88-301383bfb2b3" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/Assets/Materials/wallMaterial01.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/wallMaterial01.mat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/ControlHelp.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/ControlHelp.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/ExitCheck.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scripts/ExitCheck.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.gimm270_07_photoGallery/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Photos/buddleja.png" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Photos/budleja.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Photos/buddleja.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Photos/budleja.png.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/mainGallery.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/mainGallery.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/mainGallery/LightingData.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/mainGallery/LightingData.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Proximity.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Proximity.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StarterAssets/InputSystem/StarterAssets.inputactions" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/StarterAssets/InputSystem/StarterAssets.inputactions" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.probuilder/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.probuilder/Settings.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -19,31 +26,44 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Assets/Scripts/ControlHelp.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/ExitCheck.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Proximity.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="2Ey1B9xEHc5g5YYfvTtm4d9MBrl" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Discover.Launch.Via.Unity": "true",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"settings.editor.selected.configurable": "discord-application",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Discover.Launch.Via.Unity&quot;: &quot;true&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;discord-application&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
}</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$PROJECT_DIR$/Builds/linux/PhotoGallery.x86_64" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Builds/linux" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
<configuration name="UnitTests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/.Unity/2021.3.9f1/Editor/Unity" />
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath $PROJECT_DIR$ -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
@ -81,7 +101,8 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1663552873780</updated>
<workItem from="1663552880082" duration="1724000" />
<workItem from="1663552880082" duration="3218000" />
<workItem from="1663567941776" duration="1037000" />
</task>
<servers />
</component>

0
Assets/Photos/buddleja.png → Assets/Photos/budleja.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

0
Assets/Photos/buddleja.png.meta → Assets/Photos/budleja.png.meta
View file

324
Assets/Scenes/mainGallery.unity
View file

@ -4002,9 +4002,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
newTitle: Overview
newDesc: This panorama depicts an overview of the area where I captured the images
in this gallery.
minDistance: 4
maxDistance: 5
in this gallery. The images are ordered from left to right according to where
they were taken.
minDistance: 5
maxDistance: 8
--- !u!43 &326199260
Mesh:
m_ObjectHideFlags: 0
@ -6539,6 +6540,11 @@ Transform:
m_Father: {fileID: 133003047}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &463611863 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3}
m_PrefabInstance: {fileID: 2573019531684880200}
m_PrefabAsset: {fileID: 0}
--- !u!43 &491205786
Mesh:
m_ObjectHideFlags: 0
@ -6715,6 +6721,7 @@ GameObject:
- component: {fileID: 494939928}
- component: {fileID: 494939927}
- component: {fileID: 494939926}
- component: {fileID: 494939929}
m_Layer: 0
m_Name: redFlowers
m_TagString: Untagged
@ -6801,6 +6808,25 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494939924}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &494939929
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494939924}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Half and Half
newDesc: I intentionally broke the rule of thirds a bit in this picture (though
the biggest flower still falls along that line), because I wanted to try and
divide the image roughly in half between the bright red of the flowers in the
foreground, and the background leaves.
minDistance: 4
maxDistance: 5
--- !u!1 &543037968
GameObject:
m_ObjectHideFlags: 0
@ -9315,6 +9341,7 @@ GameObject:
- component: {fileID: 769785362}
- component: {fileID: 769785361}
- component: {fileID: 769785360}
- component: {fileID: 769785363}
m_Layer: 0
m_Name: redFlower
m_TagString: Untagged
@ -9401,6 +9428,23 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 769785358}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &769785363
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 769785358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Red Flower
newDesc: I simply loved the bright color of these flowers, and wanted to show it
off.
minDistance: 4
maxDistance: 5
--- !u!1 &788605386
GameObject:
m_ObjectHideFlags: 0
@ -9855,6 +9899,102 @@ Mesh:
offset: 0
size: 0
path:
--- !u!1 &813864458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 813864459}
- component: {fileID: 813864461}
- component: {fileID: 813864460}
- component: {fileID: 813864462}
m_Layer: 5
m_Name: ControlHelp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &813864459
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813864458}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1722350011}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -10, y: -1}
m_SizeDelta: {x: 500, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &813864460
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813864458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 590dad5226b6989b985b090681e2816c, type: 3}
m_FontSize: 72
m_FontStyle: 1
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 72
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'WASD to move
ESC to exit'
--- !u!222 &813864461
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813864458}
m_CullTransparentMesh: 1
--- !u!114 &813864462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813864458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b3352f32788f091394fc611cdc7c636, type: 3}
m_Name:
m_EditorClassIdentifier:
helpText: {fileID: 813864458}
--- !u!1 &819103745
GameObject:
m_ObjectHideFlags: 0
@ -13663,6 +13803,50 @@ Mesh:
offset: 0
size: 0
path:
--- !u!1 &1104127459
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1104127461}
- component: {fileID: 1104127460}
m_Layer: 0
m_Name: ExitCheck
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1104127460
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1104127459}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faac4387698773f0594783fc3e5440f0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1104127461
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1104127459}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 550.5, y: 257, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1130834065
GameObject:
m_ObjectHideFlags: 0
@ -14019,6 +14203,7 @@ GameObject:
- component: {fileID: 1170603066}
- component: {fileID: 1170603065}
- component: {fileID: 1170603064}
- component: {fileID: 1170603067}
m_Layer: 0
m_Name: ropeCloseup
m_TagString: Untagged
@ -14105,6 +14290,22 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170603062}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1170603067
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170603062}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle:
newDesc:
minDistance: 4
maxDistance: 5
--- !u!43 &1185486712
Mesh:
m_ObjectHideFlags: 0
@ -14843,6 +15044,7 @@ GameObject:
- component: {fileID: 1207716489}
- component: {fileID: 1207716488}
- component: {fileID: 1207716487}
- component: {fileID: 1207716490}
m_Layer: 0
m_Name: roseHips
m_TagString: Untagged
@ -14929,6 +15131,24 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1207716485}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1207716490
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1207716485}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Rose Hips
newDesc: These are the fruits of the rose plants growing along the fence. I tried
to use the line of the stem they are growing on to guide the viewer's eye across
the image.
minDistance: 4
maxDistance: 5
--- !u!1 &1274059292
GameObject:
m_ObjectHideFlags: 0
@ -21145,6 +21365,7 @@ GameObject:
- component: {fileID: 1669947503}
- component: {fileID: 1669947502}
- component: {fileID: 1669947501}
- component: {fileID: 1669947504}
m_Layer: 0
m_Name: framedFlowers
m_TagString: Untagged
@ -21231,6 +21452,23 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1669947499}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1669947504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1669947499}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Flowers through Leaves
newDesc: I wanted to try using the technique of a "frame within a frame", so I
captured these flowers through the tall leaves of another plant.
minDistance: 4
maxDistance: 5
--- !u!1 &1679421822
GameObject:
m_ObjectHideFlags: 0
@ -22415,6 +22653,7 @@ RectTransform:
m_Children:
- {fileID: 1897960196}
- {fileID: 1986132873}
- {fileID: 813864459}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -22964,6 +23203,7 @@ GameObject:
- component: {fileID: 1781120469}
- component: {fileID: 1781120468}
- component: {fileID: 1781120467}
- component: {fileID: 1781120470}
m_Layer: 0
m_Name: beeFlower
m_TagString: Untagged
@ -23050,6 +23290,23 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1781120465}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1781120470
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1781120465}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: A Friend
newDesc: A bit later, I finally managed to capture this image of a friendly bee
on this flower.
minDistance: 4
maxDistance: 5
--- !u!1 &1797787615
GameObject:
m_ObjectHideFlags: 0
@ -23406,6 +23663,7 @@ GameObject:
- component: {fileID: 1824030419}
- component: {fileID: 1824030418}
- component: {fileID: 1824030417}
- component: {fileID: 1824030420}
m_Layer: 0
m_Name: yellowFlower
m_TagString: Untagged
@ -23492,6 +23750,24 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1824030415}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1824030420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1824030415}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Just Missed It
newDesc: In this image, I barely missed capturing a bee that had been circling.
However, I still enjoy the brightness of this particular flower, and the balance
it has with the leaves on the right.
minDistance: 4
maxDistance: 5
--- !u!1 &1824493068
GameObject:
m_ObjectHideFlags: 0
@ -23997,7 +24273,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.47058824, g: 0.6313726, b: 0.73333335, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -24006,11 +24282,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 63015b5399fb597cf966c4220a4e3252, type: 3}
m_FontSize: 24
m_FontSize: 48
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 60
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
@ -26395,7 +26671,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.47058824, g: 0.6313726, b: 0.73333335, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -28583,8 +28859,9 @@ GameObject:
- component: {fileID: 2131232952}
- component: {fileID: 2131232951}
- component: {fileID: 2131232950}
- component: {fileID: 2131232954}
m_Layer: 0
m_Name: buddleja
m_Name: budleja
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -28669,6 +28946,23 @@ Transform:
m_Father: {fileID: 246693464}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 180, z: 90}
--- !u!114 &2131232954
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2131232949}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98992e6cde6dc02c7839fafcab46b9cb, type: 3}
m_Name:
m_EditorClassIdentifier:
newTitle: Budleja
newDesc: This flower (Budleja davidii) is one of my mom's favorites. The purple
color provides a large amount of contrast with the background.
minDistance: 4
maxDistance: 5
--- !u!43 &2137581294
Mesh:
m_ObjectHideFlags: 0
@ -30161,7 +30455,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5420857361349278248, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3}
m_PrefabInstance: {fileID: 2573019531684880200}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_GameObject: {fileID: 463611863}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e087ecce43ebbff45a1b360637807d93, type: 3}
@ -30177,6 +30471,18 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3}
m_PrefabInstance: {fileID: 2573019531684880200}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2573019531684880208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 463611863}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faac4387698773f0594783fc3e5440f0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3467331753149304036
GameObject:
m_ObjectHideFlags: 0

19
Assets/Scripts/ControlHelp.cs Normal file
View file

@ -0,0 +1,19 @@
using System.Collections;
using UnityEngine;
public class ControlHelp : MonoBehaviour
{
public GameObject helpText;
// Start is called before the first frame update
void Start()
{
StartCoroutine(hideText());
}
IEnumerator hideText()
{
yield return new WaitForSecondsRealtime(5.0f);
helpText.SetActive(false);
}
}

11
Assets/Scripts/ControlHelp.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3b3352f32788f091394fc611cdc7c636
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

26
Assets/Scripts/ExitCheck.cs Normal file
View file

@ -0,0 +1,26 @@
using UnityEngine;
using UnityEngine.InputSystem;
public class ExitCheck : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void OnExit(InputValue value)
{
if (value.isPressed)
{
Debug.Log("Goodbye!");
Application.Quit(0);
}
}
}

11
Assets/Scripts/ExitCheck.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: faac4387698773f0594783fc3e5440f0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

32
Assets/StarterAssets/InputSystem/StarterAssets.inputactions
View file

@ -11,7 +11,8 @@
"id": "6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": true
},
{
"name": "Look",
@ -19,7 +20,8 @@
"id": "2690c379-f54d-45be-a724-414123833eb4",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": true
},
{
"name": "Jump",
@ -27,7 +29,8 @@
"id": "8c4abdf8-4099-493a-aa1a-129acec7c3df",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "Sprint",
@ -35,7 +38,17 @@
"id": "980e881e-182c-404c-8cbf-3d09fdb48fef",
"expectedControlType": "",
"processors": "",
"interactions": ""
"interactions": "",
"initialStateCheck": false
},
{
"name": "Exit",
"type": "Button",
"id": "036e45ec-bae4-4161-a045-88ced65e88ee",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@ -214,6 +227,17 @@
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "722910eb-f4bd-4d18-b611-7461b9e17de4",
"path": "<Keyboard>/escape",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
}
]
}

3
ProjectSettings/EditorBuildSettings.asset
View file

@ -8,4 +8,5 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/mainGallery.unity
guid: ae31ed527eed98190bf5641909c25287
m_configObjects: {}
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}

5
ProjectSettings/Packages/com.unity.probuilder/Settings.json
View file

@ -63,6 +63,11 @@
"key": "editor.autoRecalculateCollisions",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.stripProBuilderScriptsOnBuild",
"value": "{\"m_Value\":true}"
},
{
"type": "UnityEngine.ProBuilder.LogLevel, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "log.level",