Skip to content

Commit 46fcef0

Browse files
authored
Merge pull request #106 from Nytra/splittening
.NET 9 / The Splittening
2 parents 9ed6d7a + 196e369 commit 46fcef0

49 files changed

Lines changed: 984 additions & 108 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ProjectObsidian/Components/Audio/SineShapedRingModulator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Elements.Core;
55
using Obsidian.Elements;
66
using Awwdio;
7+
using Elements.Data;
78

89
namespace Obsidian.Components.Audio
910
{

ProjectObsidian/Components/Devices/MIDI/MIDI_CC_Value.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
using CoreMidi;
99
using Commons.Music.Midi;
1010
using Obsidian.Elements;
11+
using Elements.Data;
1112

12-
namespace Components.Devices.MIDI;
13+
namespace Obsidian.Components.Devices.MIDI;
1314

1415
[Category(new string[] { "Obsidian/Devices/MIDI" })]
16+
[OldTypeName("Components.Devices.MIDI.MIDI_CC_Value")]
1517
public class MIDI_CC_Value : Component
1618
{
1719
public readonly SyncRef<MIDI_InputDevice> InputDevice;

ProjectObsidian/Components/Devices/MIDI/MIDI_InputDevice.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
using Obsidian.Elements;
88
using Obsidian;
99
using System;
10+
using Elements.Data;
1011

11-
namespace Components.Devices.MIDI;
12+
namespace Obsidian.Components.Devices.MIDI;
1213

1314
[Category(new string[] { "Obsidian/Devices/MIDI" })]
1415
[OldTypeName("Obsidian.MIDI_InputDevice")]
16+
[OldTypeName("Components.Devices.MIDI.MIDI_InputDevice")]
1517
public class MIDI_InputDevice : Component, IMidiInputListener
1618
{
1719
[NoContinuousParsing]

ProjectObsidian/Components/Devices/MIDI/MIDI_PitchWheel_Value.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
using CoreMidi;
99
using Commons.Music.Midi;
1010
using Obsidian.Elements;
11+
using Elements.Data;
1112

12-
namespace Components.Devices.MIDI;
13+
namespace Obsidian.Components.Devices.MIDI;
1314

1415
[Category(new string[] { "Obsidian/Devices/MIDI" })]
16+
[OldTypeName("Components.Devices.MIDI.MIDI_PitchWheel_Value")]
1517
public class MIDI_PitchWheel_Value : Component
1618
{
1719
public readonly SyncRef<MIDI_InputDevice> InputDevice;

ProjectObsidian/Components/Mesh/MengerSponge.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Elements.Core;
33
using FrooxEngine;
44
using System;
5+
using Renderite.Shared;
56

67
namespace Obsidian
78
{

ProjectObsidian/Components/Mesh/PlanetMesh.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Elements.Core;
33
using FrooxEngine;
44
using System;
5+
using Renderite.Shared;
56

67
namespace Obsidian
78
{

ProjectObsidian/Components/Mesh/SierpinskiPyramidMesh.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Elements.Core;
33
using FrooxEngine;
44
using System;
5+
using Renderite.Shared;
56

67
namespace Obsidian
78
{

ProjectObsidian/Components/Transform/Drivers/MultiValueArithmeticDriver.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Linq;
22
using Elements.Core;
33
using FrooxEngine;
4+
using Elements.Data;
45

56
namespace Obsidian;
67

ProjectObsidian/Components/Users/BoundingBoxUserTracker.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
using System.Linq;
33
using Elements.Assets;
44
using Elements.Core;
5+
using Elements.Data;
6+
using FrooxEngine;
57

6-
namespace FrooxEngine
8+
namespace Obsidian.Utility
79
{
810
[Category("Obsidian/Utility")]
11+
[OldTypeName("FrooxEngine.BoundingBoxUserTracker")]
912
public class BoundingBoxUserTracker : Component
1013
{
1114
public readonly Sync<UserRoot.UserNode> PositionSource;

ProjectObsidian/Components/Users/ImuInfo.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
using System;
22
using System.Runtime.InteropServices;
33
using Elements.Core;
4+
using Elements.Data;
5+
using Obsidian;
46
using Valve.VR;
7+
using FrooxEngine;
58

6-
namespace FrooxEngine;
9+
namespace Obsidian.Devices;
710

811
[Category("Obsidian/Devices")]
12+
[OldTypeName("FrooxEngine.ImuInfo")]
913
public class ImuInfo : Component
1014
{
1115
public readonly Sync<bool> Simulate;
@@ -39,6 +43,7 @@ protected override void OnCommonUpdate()
3943

4044
if (Simulate.Value && LocalUser == SimulatingUser.Target)
4145
{
46+
if (!OpenVR_Helper.TryInitialize()) return;
4247
if (!LocalUser.VR_Active || OpenVR.IOBuffer is null || string.IsNullOrEmpty(Path.Value)) CloseBuffer();
4348
else if (_buffer == 0 || _previousPath != Path.Value)
4449
{

0 commit comments

Comments
 (0)