diff --git a/Platforms/Android/AndroidManifest.xml b/Platforms/Android/AndroidManifest.xml index 51e9592..a089cde 100644 --- a/Platforms/Android/AndroidManifest.xml +++ b/Platforms/Android/AndroidManifest.xml @@ -1,9 +1,9 @@ - + @@ -17,25 +17,43 @@ - + - - - + + + - - + + - + - + @@ -45,25 +63,52 @@ - - - - - + + + + + - - - + + + - + @@ -71,7 +116,7 @@ - \ No newline at end of file + diff --git a/Platforms/Android/MainActivity.cs b/Platforms/Android/MainActivity.cs index 0dfb233..219ad6a 100644 --- a/Platforms/Android/MainActivity.cs +++ b/Platforms/Android/MainActivity.cs @@ -9,7 +9,7 @@ using System; using System.Reflection; using System.Threading; -namespace slash; +namespace dofdemo; [Activity(Label = "@string/app_name", MainLauncher = true, Exported = true)] [IntentFilter(new[] { Intent.ActionMain }, Categories = new[] { "org.khronos.openxr.intent.category.IMMERSIVE_HMD", "com.oculus.intent.category.VR", Intent.CategoryLauncher })] diff --git a/Platforms/Android/Resources/mipmap-hdpi/appicon_foreground.png b/Platforms/Android/Resources/mipmap-hdpi/appicon_foreground.png index 6e90911..26c3bae 100644 --- a/Platforms/Android/Resources/mipmap-hdpi/appicon_foreground.png +++ b/Platforms/Android/Resources/mipmap-hdpi/appicon_foreground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8feb8d71289b44e6007064235c9c071b050361cd8f42fd669331b279746b220a -size 1526 +oid sha256:7dfbe51d382334ec81865e209654f9a86d9643f901b96c36b6348d1293675b50 +size 1832 diff --git a/Platforms/Android/Resources/mipmap-mdpi/appicon_foreground.png b/Platforms/Android/Resources/mipmap-mdpi/appicon_foreground.png index cfa7cf0..ea25a20 100644 --- a/Platforms/Android/Resources/mipmap-mdpi/appicon_foreground.png +++ b/Platforms/Android/Resources/mipmap-mdpi/appicon_foreground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32eaa8cf1d7363736563c176efc84a99c6b2b75216e7f40b56f66d6e65386bcc -size 1040 +oid sha256:9714d8771e56bad897b048d6598fef2cf484cccb403986c189e19bfb81c98867 +size 1130 diff --git a/Platforms/Android/Resources/mipmap-xhdpi/appicon_foreground.png b/Platforms/Android/Resources/mipmap-xhdpi/appicon_foreground.png index e3af9b7..2fe06b3 100644 --- a/Platforms/Android/Resources/mipmap-xhdpi/appicon_foreground.png +++ b/Platforms/Android/Resources/mipmap-xhdpi/appicon_foreground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cfcbd53ddc0d532a587ef5047701e815c1dd01e09334ea410075e98a6749182 -size 2013 +oid sha256:4d760f4594f2c8d5d72bb78b355f9b66a7e81eb8f24279b4cf32e596e321c362 +size 2503 diff --git a/Platforms/Android/Resources/mipmap-xxhdpi/appicon_foreground.png b/Platforms/Android/Resources/mipmap-xxhdpi/appicon_foreground.png index 9b0abe6..6dc103e 100644 --- a/Platforms/Android/Resources/mipmap-xxhdpi/appicon_foreground.png +++ b/Platforms/Android/Resources/mipmap-xxhdpi/appicon_foreground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70b729b17de042fcaaa58dccc414b7e710ffab97ac926ab02660ecadd8dd682c -size 2937 +oid sha256:6cb34dc9bb82fb20bbcdad7f17e4b86d2bf973310fea826445fe268648a971df +size 3794 diff --git a/Platforms/Android/Resources/mipmap-xxxhdpi/appicon_foreground.png b/Platforms/Android/Resources/mipmap-xxxhdpi/appicon_foreground.png index ff196bf..ab0abee 100644 --- a/Platforms/Android/Resources/mipmap-xxxhdpi/appicon_foreground.png +++ b/Platforms/Android/Resources/mipmap-xxxhdpi/appicon_foreground.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1970b876622d57d14e58db2d3229ee3f46111b4458168b97ae24a0dd6a06d860 -size 3911 +oid sha256:84ae08e09e80bfc84ddcb22435cc6006ae580dac8dab6aae5a2f318a35ec07af +size 5514 diff --git a/Platforms/Android/Resources/values/strings.xml b/Platforms/Android/Resources/values/strings.xml index e2703c8..1776366 100644 --- a/Platforms/Android/Resources/values/strings.xml +++ b/Platforms/Android/Resources/values/strings.xml @@ -1,4 +1,4 @@ - slash - slash + dofdemo + dofdemo diff --git a/Platforms/Net/App.ico b/Platforms/Net/App.ico index dbd447e..3ee5dc0 100644 Binary files a/Platforms/Net/App.ico and b/Platforms/Net/App.ico differ diff --git a/Projects/Android/slash.Android.csproj b/Projects/Android/dofdemo.Android.csproj similarity index 95% rename from Projects/Android/slash.Android.csproj rename to Projects/Android/dofdemo.Android.csproj index 750bf7e..40f591e 100644 --- a/Projects/Android/slash.Android.csproj +++ b/Projects/Android/dofdemo.Android.csproj @@ -4,10 +4,10 @@ android-arm64 29 Exe - com.dofdev.slash + com.dofdev.dofdemo 1 1.0 - slash + dofdemo true Standard diff --git a/slash.csproj b/dofdemo.csproj similarity index 100% rename from slash.csproj rename to dofdemo.csproj diff --git a/readme.md b/readme.md index 285fac4..fc6e770 100644 --- a/readme.md +++ b/readme.md @@ -23,16 +23,16 @@ adb connect 192.168.1.219 # publish build # increment version in Platforms/Android/AndroidManifest.xml -dotnet publish -c Release Projects/Android/slash.Android.csproj +dotnet publish -c Release Projects/Android/dofdemo.Android.csproj -# adb install Projects/Android/bin/Release/net7.0-android/com.dofdev.slash-Signed.apk +# adb install Projects/Android/bin/Release/net7.0-android/com.dofdev.dofdemo-Signed.apk # upload quest source .env ./ovr-platform-util upload-quest-build -a $APP_ID -s $APP_SECRET --apk $APK_PATH -c alpha -n "message" # debug -adb logcat | grep com.dofdev.slash +adb logcat | grep com.dofdev.dofdemo # install a specific android platform @@ -41,29 +41,19 @@ sdkmanager "platforms;android-33" "build-tools;33.0.0" ``` todo - pitch - anime slasher with juicy dofs + centralized app for our interaction tech demos target audience/experience - ~13-18-year-olds who enjoy competitive, skill-based, solo gaming - 360 standing experience on all openxr hmds - user/dev level editor for additional creative expression and content headroom - moderate learning curve - stylized visuals - fun to play daily for a couple weeks or so + peers to get a feel of some of our interactions without in a time efficient manner + send and forget (perfect ux / no confusion or hand holding needed) - core mechanics - stretch slash - revolver - flick reload - - enemy design - dmg - spd def - 3 single types *fodder - dmg, spd, def - 3 double types *competent - dmg+spd, spd+def, def+dmg + featuring: + [] stretch_cursor + [] color_cube + [] orbital_view + [] fullstick + [] twist_cursor + [] cubic_flow bug(s) ... diff --git a/src/Arts.cs b/src/Arts.cs index 7c790ea..4d7d53e 100644 --- a/src/Arts.cs +++ b/src/Arts.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using StereoKit; -namespace slash; +namespace dofdemo; static class Arts { @@ -13,7 +13,7 @@ static class Arts static Material mat_backface = new Material("backface.hlsl"); static Material mat_justcolor = new Material("justcolor.hlsl"); - static Material mat_slash = new Material("unlit.hlsl"); + static Material mat_dofdemo = new Material("unlit.hlsl"); public static Vec3 shake = new(0, 0, 0); // static Quat spin_ori = Quat.Identity; @@ -44,7 +44,7 @@ static class Arts mat_both.Chain = mat_backface; - mat_slash.FaceCull = Cull.None; + mat_dofdemo.FaceCull = Cull.None; } public static void Frame() @@ -114,7 +114,7 @@ static class Arts } ); mesh.Draw( - mat_slash, + mat_dofdemo, Matrix.Identity, Color.Hex(0xF9BF05FF).ToLinear() ); diff --git a/src/Maths.cs b/src/Maths.cs index ef31c57..e8fb86f 100644 --- a/src/Maths.cs +++ b/src/Maths.cs @@ -1,6 +1,6 @@ using System; -namespace slash; +namespace dofdemo; public static class Maths { diff --git a/src/Mono.cs b/src/Mono.cs index ca6922c..22e7e8f 100644 --- a/src/Mono.cs +++ b/src/Mono.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using StereoKit; -namespace slash; +namespace dofdemo; static class Mono { @@ -27,7 +27,7 @@ static class Mono { game_time = 0.0; world_pose = new(0, -1, -2); - menu = new(true); + menu = new(false); menu_pose = new(0, 0, 0); menu_scale = 1 * U.cm; mode = Mode.Mount; diff --git a/src/Program.cs b/src/Program.cs index 50d4beb..44cf822 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -2,7 +2,7 @@ using StereoKit; using StereoKit.Framework; -namespace slash; +namespace dofdemo; class Program { @@ -13,7 +13,7 @@ class Program // Initialize StereoKit SKSettings settings = new SKSettings { - appName = "slash", + appName = "dofdemo", assetsFolder = "Assets", blendPreference = DisplayBlend.AnyTransparent, // overlayApp = true, @@ -22,6 +22,7 @@ class Program disableFlatscreenMRSim = true, renderScaling = 2, renderMultisample = 0, + // mode = AppMode.Simulator, }; if (!SK.Initialize(settings)) @@ -31,7 +32,7 @@ class Program World.OcclusionEnabled = true; Device.DisplayBlend = DisplayBlend.AnyTransparent; Renderer.EnableSky = false; - Renderer.ClearColor = Color.Hex(0x42A590FF).ToLinear();// new Color(0.0f, 0.0f, 0.0f, 0.0f); + Renderer.ClearColor = Color.Hex(0x808080FF).ToLinear();// new Color(0.0f, 0.0f, 0.0f, 0.0f); Rig.Init(); Mono.Init(); diff --git a/src/Rig.cs b/src/Rig.cs index 9b8b4e8..2bf3061 100644 --- a/src/Rig.cs +++ b/src/Rig.cs @@ -1,6 +1,6 @@ using StereoKit; -namespace slash; +namespace dofdemo; static class Rig { diff --git a/src/SFX.cs b/src/SFX.cs index cf4378f..69ded55 100644 --- a/src/SFX.cs +++ b/src/SFX.cs @@ -1,6 +1,6 @@ using StereoKit; -namespace slash; +namespace dofdemo; static class SFX { diff --git a/src/VCam.cs b/src/VCam.cs index d77cf01..6b9a0a9 100644 --- a/src/VCam.cs +++ b/src/VCam.cs @@ -1,6 +1,6 @@ using StereoKit; -namespace slash; +namespace dofdemo; static class VCam { diff --git a/src/VFX.cs b/src/VFX.cs index 2ac072c..6135fb3 100644 --- a/src/VFX.cs +++ b/src/VFX.cs @@ -1,7 +1,7 @@ using StereoKit; using System; -namespace slash; +namespace dofdemo; static class VFX {