From 58bbd1a2f77d3549b384988c23a17c86fd64470d Mon Sep 17 00:00:00 2001 From: ntr Date: Sat, 16 Sep 2023 16:07:16 +1000 Subject: [PATCH] xbox lighting issues --- Assets/Images/MEGASTRUCTURES.svg | 248 ++++++++++++++++++ Assets/Images/MEGASTRUCTURES.svg.meta | 54 ++++ Assets/Images/SpaceRace.Logo.png | 4 +- Assets/Images/SpaceRace.Logo.svg | 76 +++--- .../TunnelTrackLimitGreen.prefab | 26 +- Assets/Scenes/msg_blackstar.unity | 2 +- Assets/Scenes/sr_silverstorage.unity | 11 +- .../sr_silverstorage/LightingData.asset | Bin 18192 -> 18192 bytes .../sr_silverstorage/LightingData.asset.meta | 0 .../sr_silverstorage/ReflectionProbe-0.exr | 0 .../ReflectionProbe-0.exr.meta | 4 +- .../sr_silverstorage/silverstorage_walls.mat | 5 +- Assets/Src/LapService.cs | 4 +- Assets/Src/UI/DebugLogPanel.cs | 68 ++--- Assets/Src/UI/Menu.uss | 5 + ProjectSettings/ProjectSettings.asset | 15 +- README.md | 8 + TODO.md | 16 +- 18 files changed, 447 insertions(+), 99 deletions(-) create mode 100755 Assets/Images/MEGASTRUCTURES.svg create mode 100755 Assets/Images/MEGASTRUCTURES.svg.meta mode change 100644 => 100755 Assets/Images/SpaceRace.Logo.svg mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/LightingData.asset mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/LightingData.asset.meta mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr.meta mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/silverstorage_walls.mat diff --git a/Assets/Images/MEGASTRUCTURES.svg b/Assets/Images/MEGASTRUCTURES.svg new file mode 100755 index 0000000..6d061ce --- /dev/null +++ b/Assets/Images/MEGASTRUCTURES.svg @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Images/MEGASTRUCTURES.svg.meta b/Assets/Images/MEGASTRUCTURES.svg.meta new file mode 100755 index 0000000..89bec96 --- /dev/null +++ b/Assets/Images/MEGASTRUCTURES.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: e3958912cbfbde44caf565d955a13ba3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 0 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 7b9a895245e7aeb419a27d750f412dcf + PhysicsOutlines: [] diff --git a/Assets/Images/SpaceRace.Logo.png b/Assets/Images/SpaceRace.Logo.png index ba7f21c..088cfdb 100755 --- a/Assets/Images/SpaceRace.Logo.png +++ b/Assets/Images/SpaceRace.Logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c27e11dc77b97c101abf90565c7b313d372d54e6d9c7a63928af275d12020399 -size 77065 +oid sha256:a658cc7a3a57fb0e7c2d9f64e8db9ef2775866a01bb90b191ea3a32fa2f1b93b +size 47869 diff --git a/Assets/Images/SpaceRace.Logo.svg b/Assets/Images/SpaceRace.Logo.svg old mode 100644 new mode 100755 index 2688edf..7406bc7 --- a/Assets/Images/SpaceRace.Logo.svg +++ b/Assets/Images/SpaceRace.Logo.svg @@ -7,11 +7,11 @@ viewBox="0 0 3012.0006 812.00049" version="1.1" id="svg16" - inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="SpaceRace.Logo.svg" - inkscape:export-filename="/home/ntr/SpaceRace/Assets/SpaceRace.Logo.png" - inkscape:export-xdpi="128" - inkscape:export-ydpi="128" + inkscape:export-filename="SpaceRace.Logo.png" + inkscape:export-xdpi="81.593613" + inkscape:export-ydpi="81.593613" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -1870,7 +1870,7 @@ + id="color-profile2" /> @@ -2618,10 +2618,10 @@ inkscape:current-layer="layer1" showgrid="true" inkscape:snap-grids="true" - inkscape:window-width="2556" - inkscape:window-height="1396" - inkscape:window-x="2560" - inkscape:window-y="40" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="2552" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:showpageshadow="false" showborder="true" @@ -2638,7 +2638,8 @@ fit-margin-left="100" fit-margin-right="100" fit-margin-bottom="100" - lock-margins="true"> + lock-margins="true" + inkscape:deskcolor="#505050"> + originy="106.00027" + units="px" + visible="true" /> @@ -2667,14 +2670,15 @@ style="display:inline"> + transform="matrix(1.2000212,0,0,1.2000212,-111.6051,343.63772)" + style="stroke-width:19.99964667;stroke-dasharray:none"> + style="stroke-width:102.70640615;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" /> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.7006px;font-family:Jura;-inkscape-font-specification:'Jura, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:19.99964667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> + transform="matrix(2.5499569,0,0,2.5499569,-621.79621,856.40175)" + style="stroke-width:7.84313126;stroke-dasharray:none"> + transform="matrix(2.5499569,0,0,2.5499569,-600.75304,864.04475)" + style="stroke-width:7.84313126;stroke-dasharray:none"> @^Z B4bT7p delta 58 rcmbQx$2b9q%o$BKS_HbOo1_^sK!F#K<^o~~AU+HggHe+=xFrApKd1=B diff --git a/Assets/Scenes/sr_silverstorage/LightingData.asset.meta b/Assets/Scenes/sr_silverstorage/LightingData.asset.meta old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr b/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr.meta old mode 100644 new mode 100755 index f4d73cc..a35a932 --- a/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr.meta +++ b/Assets/Scenes/sr_silverstorage/ReflectionProbe-0.exr.meta @@ -94,7 +94,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server + buildTarget: Windows Store Apps maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,7 +107,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 diff --git a/Assets/Scenes/sr_silverstorage/silverstorage_walls.mat b/Assets/Scenes/sr_silverstorage/silverstorage_walls.mat old mode 100644 new mode 100755 index 6d4b225..3ee640c --- a/Assets/Scenes/sr_silverstorage/silverstorage_walls.mat +++ b/Assets/Scenes/sr_silverstorage/silverstorage_walls.mat @@ -12,12 +12,13 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _METALLICSPECGLOSSMAP - _NORMALMAP - _OCCLUSIONMAP - _PARALLAXMAP m_InvalidKeywords: [] - m_LightmapFlags: 6 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 @@ -119,7 +120,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.4862745, g: 3.764706, b: 0.4862745, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] --- !u!114 &740438398032646426 diff --git a/Assets/Src/LapService.cs b/Assets/Src/LapService.cs index b1d395a..a2e70e1 100644 --- a/Assets/Src/LapService.cs +++ b/Assets/Src/LapService.cs @@ -21,8 +21,8 @@ public class LapService { public Lap Pb; public Lap LapRecord; - // static string apiEndpoint = "https://spacerace.systems/api"; - static string apiEndpoint = "http://localhost:40080"; + static string apiEndpoint = "https://spacerace.systems/api"; + // static string apiEndpoint = "http://localhost:40080"; public string Position => _pb switch { PbDTO pb => pb.Position.ToString(), diff --git a/Assets/Src/UI/DebugLogPanel.cs b/Assets/Src/UI/DebugLogPanel.cs index 021b71e..27f8e11 100644 --- a/Assets/Src/UI/DebugLogPanel.cs +++ b/Assets/Src/UI/DebugLogPanel.cs @@ -1,40 +1,40 @@ -using UnityEngine; -using System.Collections; +// using UnityEngine; +// using System.Collections; -public class DebugLogPanel : MonoBehaviour -{ - uint qsize = 15; // number of messages to keep - Queue myLogQueue = new Queue(); +// public class DebugLogPanel : MonoBehaviour +// { +// uint qsize = 15; // number of messages to keep +// Queue myLogQueue = new Queue(); - void Start() { - Debug.Log("SpaceRace!"); - Debug.Log("WSAD - Strafe"); - Debug.Log("Mouse 1 - Thrust"); - Debug.Log("Mouse 2 - Decelerate"); - Debug.Log("Space - Respawn"); - Debug.Log("F10 - Exit"); - } +// void Start() { +// Debug.Log("SpaceRace!"); +// Debug.Log("WSAD - Strafe"); +// Debug.Log("Mouse 1 - Thrust"); +// Debug.Log("Mouse 2 - Decelerate"); +// Debug.Log("Space - Respawn"); +// Debug.Log("F10 - Exit"); +// } - void OnEnable() { - Application.logMessageReceived += HandleLog; - } +// void OnEnable() { +// Application.logMessageReceived += HandleLog; +// } - void OnDisable() { - Application.logMessageReceived -= HandleLog; - } +// void OnDisable() { +// Application.logMessageReceived -= HandleLog; +// } - void HandleLog(string logString, string stackTrace, LogType type) { - // myLogQueue.Enqueue("[" + type + "] : " + logString); - myLogQueue.Enqueue(logString); - if (type == LogType.Exception) - myLogQueue.Enqueue(stackTrace); - while (myLogQueue.Count > qsize) - myLogQueue.Dequeue(); - } +// void HandleLog(string logString, string stackTrace, LogType type) { +// // myLogQueue.Enqueue("[" + type + "] : " + logString); +// myLogQueue.Enqueue(logString); +// if (type == LogType.Exception) +// myLogQueue.Enqueue(stackTrace); +// while (myLogQueue.Count > qsize) +// myLogQueue.Dequeue(); +// } - void OnGUI() { - GUILayout.BeginArea(new Rect(0, 0, 400, Screen.height)); - GUILayout.Label("\n" + string.Join("\n", myLogQueue.ToArray())); - GUILayout.EndArea(); - } -} \ No newline at end of file +// void OnGUI() { +// GUILayout.BeginArea(new Rect(0, 0, 400, Screen.height)); +// GUILayout.Label("\n" + string.Join("\n", myLogQueue.ToArray())); +// GUILayout.EndArea(); +// } +// } \ No newline at end of file diff --git a/Assets/Src/UI/Menu.uss b/Assets/Src/UI/Menu.uss index 811a4a2..2de6b06 100644 --- a/Assets/Src/UI/Menu.uss +++ b/Assets/Src/UI/Menu.uss @@ -9,6 +9,11 @@ height: 256px; } +#left { + padding-left: 24px; + padding-bottom: 24px; +} + Button { background-color: rgba(0, 0, 0, 0.26); color: rgb(255, 255, 255); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c327dab..6804d91 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -20,7 +20,7 @@ PlayerSettings: m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 + m_SplashScreenAnimation: 0 m_SplashScreenLogoStyle: 1 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 @@ -39,7 +39,9 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: [] + m_SplashScreenLogos: + - logo: {fileID: 3286163911610860551, guid: e3958912cbfbde44caf565d955a13ba3, type: 3} + duration: 2 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 2560 @@ -805,8 +807,13 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} + platformCapabilities: + WindowsStoreApps: + InternetClient: True + metroTargetDeviceFamilies: + Desktop: True + Mobile: True + Xbox: True metroFTAName: metroFTAFileTypes: [] metroProtocolName: diff --git a/README.md b/README.md index 8ad4259..a00217e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,14 @@ as if you are being acclerated through a particle collider in the far future, technology depends on the solving of efficient paths through the shapes of ancient ruins +## About + +SpaceRace is a futuristic 3d racing game where players compete to set the best time on visually striking tracks. + +Focus on finding the perfect line as you accelerate through tunnels on the edge of a nebula or drift smoothly through the curves of a storage facility. + +Inspired by precision movement games such as Surf, SpaceRace features a global leaderboard of lap times around both famous racetracks reimagined and novel 3D ZeroG circuits. + ## tags race, space, spacerace, ship, 3d, racing, diff --git a/TODO.md b/TODO.md index 404b9a0..61068b6 100644 --- a/TODO.md +++ b/TODO.md @@ -49,6 +49,11 @@ - menu - take coming soon from todo +- weather + - different global volume effects + - fog + - sky colours etc + - FLASHY C0L0RZ - first time through map sectors flash their colour eg. green, red, blue @@ -67,4 +72,13 @@ ffmpeg -ss 18 -t 3 -i "2023-09-07 18-17-43.mkv" \ -vf "fps=20,scale=320:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse" \ - -loop 0 sr_junglism.gif \ No newline at end of file + -loop 0 sr_junglism.gif + +# Build Stuff +# don't forget to change unity+vs to master builds! +1>ExitCode: 0 Duration: 0s1ms +1>Starting: C:\Users\ntr\code\SpaceRace\Build\UWP\Il2CppOutputProject\IL2CPP\build\deploy\bee_backend\win-x64\bee_backend.exe --profile="C:/Users/ntr/code/SpaceRace/Build/UWP/build/obj/il2cppOutputProject/x86/Release/buildstate/backend_profiler1.traceevents" --beedriver-listener --dagfile="C:/Users/ntr/code/SpaceRace/Build/UWP/build/obj/il2cppOutputProject/x86/Release/buildstate/bee.dag" --continue-on-failure --dagfilejson="C:/Users/ntr/code/SpaceRace/Build/UWP/build/obj/il2cppOutputProject/x86/Release/buildstate/bee.dag.json" FinalProgram +1>WorkingDir: C:/Users/ntr/code/SpaceRace/Build/UWP/build/obj/il2cppOutputProject/x86/Release/buildstate + >>>>>>>>>> LOOKS LIKE NOTHING IS HAPPENING BUT IS WORKING <<<<<<<<<<<<< + +1>ExitCode: 0 Duration: 2m:14s \ No newline at end of file