Skip to content

Commit

Permalink
Merge pull request #13 from Siddharthaaa21/main
Browse files Browse the repository at this point in the history
issue #9
  • Loading branch information
anchitd10 authored Jul 6, 2024
2 parents 44bfdf1 + fd6b1d2 commit 762f805
Show file tree
Hide file tree
Showing 7 changed files with 282 additions and 17 deletions.
8 changes: 8 additions & 0 deletions AR project/Assets/Logo.meta

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

Binary file added AR project/Assets/Logo/logo.png
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 AR project/Assets/Logo/logo.png.meta

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

Binary file added AR project/Assets/Logo/logo_transparent.png
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 AR project/Assets/Logo/logo_transparent.png.meta

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

29 changes: 16 additions & 13 deletions AR project/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,35 @@ PlayerSettings:
productName: AR project
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_SplashScreenBackgroundColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0
m_SplashScreenLogoStyle: 0
m_SplashScreenDrawMode: 1
m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1
m_SplashScreenBackgroundLandscapeAspect: 1
m_SplashScreenBackgroundPortraitAspect: 1
m_SplashScreenBackgroundLandscapeUvs:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
x: 0.1875
y: 0.1875
width: 0.625
height: 0.625
m_SplashScreenBackgroundPortraitUvs:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_SplashScreenLogos:
- logo: {fileID: 10404, guid: 0000000000000000f000000000000000, type: 0}
duration: 2
- logo: {fileID: 21300000, guid: 0f98552e32d7e39439a4bb5f87137540, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 0f98552e32d7e39439a4bb5f87137540, type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920
defaultScreenHeight: 1080
Expand Down Expand Up @@ -160,8 +164,7 @@ PlayerSettings:
resetResolutionOnWindowResize: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.UPESARTour.ARproject
applicationIdentifier: {}
buildNumber:
Standalone: 0
VisionOS: 0
Expand Down Expand Up @@ -262,7 +265,7 @@ PlayerSettings:
AndroidTargetArchitectures: 2
AndroidTargetDevices: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
androidSplashScreen: {fileID: 2800000, guid: 0f98552e32d7e39439a4bb5f87137540, type: 3}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidEnableArmv9SecurityFeatures: 0
Expand Down Expand Up @@ -711,7 +714,7 @@ PlayerSettings:
ps4IncludedModules: []
ps4attribVROutputEnabled: 0
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourceLandscape: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
blurSplashScreenBackground: 1
spritePackerPolicy:
Expand Down
8 changes: 4 additions & 4 deletions AR project/UserSettings/Layouts/default-2022.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ MonoBehaviour:
vertical: 0
controlID: 113
draggingID: 0
--- !u!114 &6
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -138,7 +138,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_Name: ProjectSettingsWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
Expand All @@ -154,7 +154,7 @@ MonoBehaviour:
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &7
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -448,7 +448,7 @@ MonoBehaviour:
m_SelectedInstanceIDs: da9dfdff
m_LastClickedInstanceID: -156198
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_ExpandedInstanceIDs: c623000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down

0 comments on commit 762f805

Please sign in to comment.