From 1e4e810a06a36f79e261257f5dbfe5f9b5851a7a Mon Sep 17 00:00:00 2001 From: spatialfree Date: Wed, 8 Dec 2021 18:57:16 -0500 Subject: [PATCH] refactor rough pass --- oriels.bat => Micro.bat | 0 README.md | 83 ++++++++++------------- {Assets => add}/DM-Mono.ttf | Bin {Assets => add}/DMMono-Regular.ttf | Bin {Assets => add}/colorcube.glb | Bin {Assets => add}/colorcube.hlsl | 0 {Assets => add}/controller.glb | Bin {Assets => add}/crown.hlsl | 0 {Assets => add}/cursor.glb | Bin {Assets => add}/floor.png | Bin {Assets => add}/joystick.glb | Bin {Assets => add}/oriel.glb | Bin {Assets => add}/oriel.hlsl | 4 +- ColorCube.cs => app/ColorCube.cs | 0 MonoNet.cs => app/MonoNet.cs | 29 ++------ Program.cs => app/Monolith.cs | 26 +++---- OrbitalView.cs => app/OrbitalView.cs | 0 SpatialCursor.cs => app/SpatialCursor.cs | 6 +- oriels.csproj | 18 ++--- {Resources => res}/colorcube.blend | Bin {Resources => res}/controller.blend | Bin {Resources => res}/cursor.blend | Bin {Resources => res}/oriel.blend | Bin dofdev-logo.png => zrc/dofdev-logo.png | Bin markberg.png => zrc/markberg.png | Bin oriel.gif => zrc/oriel.gif | Bin 26 files changed, 65 insertions(+), 101 deletions(-) rename oriels.bat => Micro.bat (100%) rename {Assets => add}/DM-Mono.ttf (100%) rename {Assets => add}/DMMono-Regular.ttf (100%) rename {Assets => add}/colorcube.glb (100%) rename {Assets => add}/colorcube.hlsl (100%) rename {Assets => add}/controller.glb (100%) rename {Assets => add}/crown.hlsl (100%) rename {Assets => add}/cursor.glb (100%) rename {Assets => add}/floor.png (100%) rename {Assets => add}/joystick.glb (100%) rename {Assets => add}/oriel.glb (100%) rename {Assets => add}/oriel.hlsl (98%) rename ColorCube.cs => app/ColorCube.cs (100%) rename MonoNet.cs => app/MonoNet.cs (95%) rename Program.cs => app/Monolith.cs (98%) rename OrbitalView.cs => app/OrbitalView.cs (100%) rename SpatialCursor.cs => app/SpatialCursor.cs (98%) rename {Resources => res}/colorcube.blend (100%) rename {Resources => res}/controller.blend (100%) rename {Resources => res}/cursor.blend (100%) rename {Resources => res}/oriel.blend (100%) rename dofdev-logo.png => zrc/dofdev-logo.png (100%) rename markberg.png => zrc/markberg.png (100%) rename oriel.gif => zrc/oriel.gif (100%) diff --git a/oriels.bat b/Micro.bat similarity index 100% rename from oriels.bat rename to Micro.bat diff --git a/README.md b/README.md index 0e3f53b..0e84c01 100644 --- a/README.md +++ b/README.md @@ -1,54 +1,41 @@ - + -## oriels + + +# oriels *a dof driven space* - - -

- -## direction -- rethink paper paradigm based software for spatial computing -- networked by default through a federated server model -- smart contract for handling security and value - -## increment -- ~~merge networking prototypes~~ -- ~~fixed latency, now for multiple clients~~ -- ~~architect interfaces for navigation~~ -- implement all dofs from site - -## override -**8 days left for the sterokit comp!** - -### MVP -switch between cursors with a button (quick press(b) on both hands to switch/cycle through the two handed ones) long press(b) on one hand to swap mainhand - -movement: -- ~~fullstick~~ -- ~~teleport and drag~~ -- ~~bezier rails~~ - -interact: -~~blocks you can manipulate with spatial cursors~~ (trackballer) -~~color them with the color cube (player colors)~~ - -- trackballer -- network the new stuff - -software: -oriel + orbital view (control a shooty guy with fullstick and spatial cursor) - -### POLISH -- fix (server sending back your data) -- *just show them red when hit* -- bezier in color cube -- calibrate cubic flow + sensitivity -- press and twist to adjust sensitivity (long press(b) and trigger for value *keep cursor active) (min 1:1) - -### ACCESSIBILITY -show how the dofs work (debug visuals *CMY) + +# pos +net.read() +c[] = reach-cursor * trackballer || cubic-flow +blocks.step(c[0].pose, c[3].pose) +cubics.step(c[0].pos, c[1].pos, c[2].pos, c[3].pos) +net.write() +oriel.raymarch()

+ +# dir += (dof - paperParadigm).normalized +server.federate() +accounts = web3() +

+ +## ++ +oriels.dofs == site.dofs +dofs.debug(CMY) +init(oriel-game) +exec(vlai) +

+ +## -- +refactor(hackathon.result()) +

+ + +





mapped out by: -@spatialfree * @opendegree \ No newline at end of file +@spatialfree * @opendegree + + \ No newline at end of file diff --git a/Assets/DM-Mono.ttf b/add/DM-Mono.ttf similarity index 100% rename from Assets/DM-Mono.ttf rename to add/DM-Mono.ttf diff --git a/Assets/DMMono-Regular.ttf b/add/DMMono-Regular.ttf similarity index 100% rename from Assets/DMMono-Regular.ttf rename to add/DMMono-Regular.ttf diff --git a/Assets/colorcube.glb b/add/colorcube.glb similarity index 100% rename from Assets/colorcube.glb rename to add/colorcube.glb diff --git a/Assets/colorcube.hlsl b/add/colorcube.hlsl similarity index 100% rename from Assets/colorcube.hlsl rename to add/colorcube.hlsl diff --git a/Assets/controller.glb b/add/controller.glb similarity index 100% rename from Assets/controller.glb rename to add/controller.glb diff --git a/Assets/crown.hlsl b/add/crown.hlsl similarity index 100% rename from Assets/crown.hlsl rename to add/crown.hlsl diff --git a/Assets/cursor.glb b/add/cursor.glb similarity index 100% rename from Assets/cursor.glb rename to add/cursor.glb diff --git a/Assets/floor.png b/add/floor.png similarity index 100% rename from Assets/floor.png rename to add/floor.png diff --git a/Assets/joystick.glb b/add/joystick.glb similarity index 100% rename from Assets/joystick.glb rename to add/joystick.glb diff --git a/Assets/oriel.glb b/add/oriel.glb similarity index 100% rename from Assets/oriel.glb rename to add/oriel.glb diff --git a/Assets/oriel.hlsl b/add/oriel.hlsl similarity index 98% rename from Assets/oriel.hlsl rename to add/oriel.hlsl index bbe2578..d8c0ac4 100644 --- a/Assets/oriel.hlsl +++ b/add/oriel.hlsl @@ -269,8 +269,8 @@ psOut ps(psIn input) { // } if(sdBox(pos - _center, _dimensions / 2) <= 0.005) { - //float4 clipPos = mul(float4(pos, 1), sk_viewproj[input.view_id]); - o.pos = mul(float4(o.world, 1), sk_viewproj[o.view_id]); + float4 clipPos = mul(float4(pos, 1), sk_viewproj[input.view_id]); + // o.pos = mul(float4(o.world, 1), sk_viewproj[o.view_id]); result.depth = clipPos.z; // float4 viewWorldPos = mul(float4(pos, 1), sk_view[input.view_id]); diff --git a/ColorCube.cs b/app/ColorCube.cs similarity index 100% rename from ColorCube.cs rename to app/ColorCube.cs diff --git a/MonoNet.cs b/app/MonoNet.cs similarity index 95% rename from MonoNet.cs rename to app/MonoNet.cs index e5ca57c..37f5c3b 100644 --- a/MonoNet.cs +++ b/app/MonoNet.cs @@ -1,16 +1,14 @@ using StereoKit; using System; using System.Net; +using System.Net.Http; using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; -using System.Speech.Synthesis; -using System.Speech.Recognition; -using System.Speech.AudioFormat; public class MonoNet { - public Mono mono; - public MonoNet(Mono mono) { + public Monolith mono; + public MonoNet(Monolith mono) { this.mono = mono; Random rnd = new Random(); me = new Peer(rnd.Next(1, 1024 * 8), SolidType.Normal, Color.White); // let the server determine the id @@ -34,17 +32,6 @@ public class MonoNet { wData = new byte[bufferSize]; peers = new Peer[64]; - // SpeechSynthesizer synth = new SpeechSynthesizer(); - // synth.Speak("oriels!"); - - // SpeechRecognitionEngine reco = new SpeechRecognitionEngine(); - - // System.IO.Stream s; - // // s.Write(); - - // SpeechAudioFormatInfo info = new SpeechAudioFormatInfo(EncodingFormat.Pcm, 16000, 16, 1, WaveFormatTag.Pcm, 1, 1); - // reco.SetInputToAudioStream(s, info); - Thread.Sleep(1000); // useful? Thread readThread = new Thread(Read); @@ -275,19 +262,13 @@ public class MonoNet { IPEndPoint endPoint = socket.LocalEndPoint as IPEndPoint; localIP = endPoint.Address.ToString(); } - publicIP = new WebClient().DownloadString("https://ipv4.icanhazip.com/").TrimEnd(); + publicIP = new HttpClient().GetStringAsync("https://ipv4.icanhazip.com/").Result.TrimEnd(); } public class Peer { - - - - // to do this we need to assign fixed id's to each peer from the server - // ++ make a peer timeout on the client side as well - public float lastPing; - public int id; + public int id; // on connect: wait on server sending your peer id public Color color; public Vec3 cursor0, cursor1, cursor2, cursor3; public Pose headset; diff --git a/Program.cs b/app/Monolith.cs similarity index 98% rename from Program.cs rename to app/Monolith.cs index 06b70f1..237beab 100644 --- a/Program.cs +++ b/app/Monolith.cs @@ -2,23 +2,19 @@ using StereoKit; using System; using System.Runtime.InteropServices; -class Program { - static void Main(string[] args) { - SKSettings settings = new SKSettings { - appName = "oriels", - assetsFolder = "Assets", - depthMode = DepthMode.D32, - }; - if (!SK.Initialize(settings)) - Environment.Exit(1); +SKSettings settings = new SKSettings { + appName = "oriels", + assetsFolder = "add", + depthMode = DepthMode.D32, +}; +if (!SK.Initialize(settings)) + Environment.Exit(1); - // TextStyle style = Text.MakeStyle(Font.FromFile("DMMono-Regular.ttf"), 0.1f, Color.White); - Mono mono = new Mono(); - mono.Run(); - } -} +// TextStyle style = Text.MakeStyle(Font.FromFile("DMMono-Regular.ttf"), 0.1f, Color.White); +Monolith mono = new Monolith(); +mono.Run(); -public class Mono { +public class Monolith { public Mic mic; public Controller domCon, subCon; public bool lefty; diff --git a/OrbitalView.cs b/app/OrbitalView.cs similarity index 100% rename from OrbitalView.cs rename to app/OrbitalView.cs diff --git a/SpatialCursor.cs b/app/SpatialCursor.cs similarity index 98% rename from SpatialCursor.cs rename to app/SpatialCursor.cs index 5b66f13..6bafacf 100644 --- a/SpatialCursor.cs +++ b/app/SpatialCursor.cs @@ -12,12 +12,12 @@ public abstract class SpatialCursor { } public class Cursors { - Mono mono; - public Cursors(Mono mono) { + Monolith mono; + public Cursors(Monolith mono) { this.mono = mono; } SpatialCursor[] oneHanded = new SpatialCursor[] { new ReachCursor(), new TwistCursor() }; int oneIndex = 0; - SpatialCursor[] twoHanded = new SpatialCursor[] { new StretchCursor(), new CubicFlow(), new SupineCursor() }; int twoIndex = 0; + SpatialCursor[] twoHanded = new SpatialCursor[] { new StretchCursor(), new CubicFlow(), new SupineCursor() }; public SpatialCursor Step(Pose domHand, Pose subHand) { SpatialCursor cursor = oneHanded[oneIndex]; diff --git a/oriels.csproj b/oriels.csproj index 74b9827..aee5575 100644 --- a/oriels.csproj +++ b/oriels.csproj @@ -8,26 +8,26 @@ - + - + PreserveNewest - + - - - + + + - - - + + + diff --git a/Resources/colorcube.blend b/res/colorcube.blend similarity index 100% rename from Resources/colorcube.blend rename to res/colorcube.blend diff --git a/Resources/controller.blend b/res/controller.blend similarity index 100% rename from Resources/controller.blend rename to res/controller.blend diff --git a/Resources/cursor.blend b/res/cursor.blend similarity index 100% rename from Resources/cursor.blend rename to res/cursor.blend diff --git a/Resources/oriel.blend b/res/oriel.blend similarity index 100% rename from Resources/oriel.blend rename to res/oriel.blend diff --git a/dofdev-logo.png b/zrc/dofdev-logo.png similarity index 100% rename from dofdev-logo.png rename to zrc/dofdev-logo.png diff --git a/markberg.png b/zrc/markberg.png similarity index 100% rename from markberg.png rename to zrc/markberg.png diff --git a/oriel.gif b/zrc/oriel.gif similarity index 100% rename from oriel.gif rename to zrc/oriel.gif