Skip to content

Commit 8e6b5be

Browse files
committed
feat: wip chunixr io
1 parent 2d5da14 commit 8e6b5be

16 files changed

+357
-306
lines changed

Assembly-CSharp.csproj

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<Compile Include="Assets\VRTemplateAssets\Scripts\XRKnob.cs" />
6868
<Compile Include="Assets\VRTemplateAssets\Scripts\BooleanToggleVisualsController.cs" />
6969
<Compile Include="Assets\VRTemplateAssets\Scripts\RayAttachModifier.cs" />
70+
<Compile Include="Assets\Duplicate.cs" />
7071
<Compile Include="Assets\VRTemplateAssets\Scripts\XRPokeFollowAffordanceFill.cs" />
7172
<Compile Include="Assets\Scripts\Settings Scripts\setcapturetype.cs" />
7273
<Compile Include="Assets\lightcolliderthing.cs" />
@@ -80,6 +81,7 @@
8081
<Compile Include="Assets\Scripts\ButtonToKey.cs" />
8182
<Compile Include="Assets\VRTemplateAssets\Scripts\Callout.cs" />
8283
<Compile Include="Assets\VRTemplateAssets\Scripts\CalloutGazeController.cs" />
84+
<Compile Include="Assets\Tap.cs" />
8385
<Compile Include="Assets\Scripts\Settings Scripts\setturnsetting.cs" />
8486
<Compile Include="Assets\VRTemplateAssets\Scripts\StepManager.cs" />
8587
<Compile Include="Assets\VRTemplateAssets\Scripts\AnchorVisuals.cs" />
@@ -92,6 +94,7 @@
9294
<None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" />
9395
<None Include="Assets\TextMesh Pro\Shaders\TMPro_Mobile.cginc" />
9496
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF SSD.shader" />
97+
<None Include="Assets\Release\chunixr.dll" />
9598
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Surface-Mobile.shader" />
9699
<None Include="Assets\TextMesh Pro\Shaders\SDFFunctions.hlsl" />
97100
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Surface.shader" />
@@ -583,10 +586,6 @@
583586
<HintPath>Assets\Plugins\WindowsInput.dll</HintPath>
584587
<Private>False</Private>
585588
</Reference>
586-
<Reference Include="Mono.Posix">
587-
<HintPath>Library\PackageCache\com.spoiledcat.git@a5968714214e\Mono.Posix\Mono.Posix.dll</HintPath>
588-
<Private>False</Private>
589-
</Reference>
590589
<Reference Include="Unity.Collections.LowLevel.ILSupport">
591590
<HintPath>Library\PackageCache\com.unity.collections@56bff8827a7e\Unity.Collections.LowLevel.ILSupport\Unity.Collections.LowLevel.ILSupport.dll</HintPath>
592591
<Private>False</Private>
@@ -599,14 +598,6 @@
599598
<HintPath>Library\PackageCache\com.unity.testtools.codecoverage@205a02cbcb39\lib\ReportGenerator\ReportGeneratorMerged.dll</HintPath>
600599
<Private>False</Private>
601600
</Reference>
602-
<Reference Include="sfw.net">
603-
<HintPath>Library\PackageCache\com.spoiledcat.git@a5968714214e\sfw\sfw.net.dll</HintPath>
604-
<Private>False</Private>
605-
</Reference>
606-
<Reference Include="SpoiledCat.Git.Localization">
607-
<HintPath>Library\PackageCache\com.spoiledcat.git@a5968714214e\Localization\SpoiledCat.Git.Localization.dll</HintPath>
608-
<Private>False</Private>
609-
</Reference>
610601
<Reference Include="Mono.Cecil">
611602
<HintPath>Library\PackageCache\com.unity.nuget.mono-cecil@d6f9955a5d5f\Mono.Cecil.dll</HintPath>
612603
<Private>False</Private>
@@ -1243,18 +1234,14 @@
12431234
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Universal.Config.Runtime.dll</HintPath>
12441235
<Private>False</Private>
12451236
</Reference>
1246-
<Reference Include="Unity.Editor.Tasks">
1247-
<HintPath>Library\ScriptAssemblies\Unity.Editor.Tasks.dll</HintPath>
1237+
<Reference Include="Unity.RenderPipelines.Universal.Editor">
1238+
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Universal.Editor.dll</HintPath>
12481239
<Private>False</Private>
12491240
</Reference>
12501241
<Reference Include="Unity.InternalAPIEngineBridge.007">
12511242
<HintPath>Library\ScriptAssemblies\Unity.InternalAPIEngineBridge.007.dll</HintPath>
12521243
<Private>False</Private>
12531244
</Reference>
1254-
<Reference Include="Unity.RenderPipelines.Universal.Editor">
1255-
<HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.Universal.Editor.dll</HintPath>
1256-
<Private>False</Private>
1257-
</Reference>
12581245
<Reference Include="Unity.Collections.Editor">
12591246
<HintPath>Library\ScriptAssemblies\Unity.Collections.Editor.dll</HintPath>
12601247
<Private>False</Private>
@@ -1279,10 +1266,6 @@
12791266
<HintPath>Library\ScriptAssemblies\Unity.TestTools.CodeCoverage.Editor.OpenCover.Mono.Reflection.dll</HintPath>
12801267
<Private>False</Private>
12811268
</Reference>
1282-
<Reference Include="com.spoiledcat.git">
1283-
<HintPath>Library\ScriptAssemblies\com.spoiledcat.git.dll</HintPath>
1284-
<Private>False</Private>
1285-
</Reference>
12861269
<Reference Include="Unity.XR.Management">
12871270
<HintPath>Library\ScriptAssemblies\Unity.XR.Management.dll</HintPath>
12881271
<Private>False</Private>

Assets/Duplicate.cs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using System.Runtime.InteropServices;
2+
using UnityEditor.Rendering;
3+
using UnityEngine;
4+
5+
public class Duplicate : MonoBehaviour
6+
{
7+
8+
[DllImport("chunixr.dll")]
9+
private static extern void io_init();
10+
11+
public GameObject toDuplicate;
12+
13+
// Start is called once before the first execution of Update after the MonoBehaviour is created
14+
void Start()
15+
{
16+
io_init();
17+
for (int x = 0; x < 16; x++)
18+
{
19+
for (int y = 0; y < 2; y++)
20+
{
21+
int cell = (x * 2) + y;
22+
if (cell != 0)
23+
{
24+
GameObject clone = GameObject.Instantiate(toDuplicate);
25+
clone.transform.SetParent(transform, worldPositionStays: false);
26+
clone.transform.position += new Vector3(0.0375f * x, 0.0f, -0.06f * y);
27+
28+
Tap myComponent = clone.GetComponent<Tap>();
29+
if (myComponent != null)
30+
{
31+
myComponent.cell = cell;
32+
}
33+
}
34+
}
35+
}
36+
}
37+
38+
}

Assets/Duplicate.cs.meta

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Release.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Release/chunixr.dll

15.5 KB
Binary file not shown.

Assets/Release/chunixr.dll.meta

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scenes/MainScene.unity

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,52 @@ CanvasRenderer:
481481
m_PrefabAsset: {fileID: 0}
482482
m_GameObject: {fileID: 116076022}
483483
m_CullTransparentMesh: 1
484+
--- !u!1 &124887583
485+
GameObject:
486+
m_ObjectHideFlags: 0
487+
m_CorrespondingSourceObject: {fileID: 0}
488+
m_PrefabInstance: {fileID: 0}
489+
m_PrefabAsset: {fileID: 0}
490+
serializedVersion: 6
491+
m_Component:
492+
- component: {fileID: 124887584}
493+
- component: {fileID: 124887585}
494+
m_Layer: 0
495+
m_Name: GameObject
496+
m_TagString: Untagged
497+
m_Icon: {fileID: 0}
498+
m_NavMeshLayer: 0
499+
m_StaticEditorFlags: 0
500+
m_IsActive: 1
501+
--- !u!4 &124887584
502+
Transform:
503+
m_ObjectHideFlags: 0
504+
m_CorrespondingSourceObject: {fileID: 0}
505+
m_PrefabInstance: {fileID: 0}
506+
m_PrefabAsset: {fileID: 0}
507+
m_GameObject: {fileID: 124887583}
508+
serializedVersion: 2
509+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
510+
m_LocalPosition: {x: -3.755, y: 0, z: 0.335}
511+
m_LocalScale: {x: 1, y: 1, z: 1}
512+
m_ConstrainProportionsScale: 0
513+
m_Children:
514+
- {fileID: 2133285095}
515+
m_Father: {fileID: 1055586877}
516+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
517+
--- !u!114 &124887585
518+
MonoBehaviour:
519+
m_ObjectHideFlags: 0
520+
m_CorrespondingSourceObject: {fileID: 0}
521+
m_PrefabInstance: {fileID: 0}
522+
m_PrefabAsset: {fileID: 0}
523+
m_GameObject: {fileID: 124887583}
524+
m_Enabled: 1
525+
m_EditorHideFlags: 0
526+
m_Script: {fileID: 11500000, guid: de032cd0bd2b2a542a5bd2d4f9a84b10, type: 3}
527+
m_Name:
528+
m_EditorClassIdentifier:
529+
toDuplicate: {fileID: 2133285094}
484530
--- !u!1 &175445918
485531
GameObject:
486532
m_ObjectHideFlags: 0
@@ -3109,6 +3155,9 @@ PrefabInstance:
31093155
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: dae0944fff8c1b74da553837d0710f97, type: 3}
31103156
insertIndex: 11
31113157
addedObject: {fileID: 558129021}
3158+
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: dae0944fff8c1b74da553837d0710f97, type: 3}
3159+
insertIndex: -1
3160+
addedObject: {fileID: 124887584}
31123161
- targetCorrespondingSourceObject: {fileID: 6063837917517679404, guid: dae0944fff8c1b74da553837d0710f97, type: 3}
31133162
insertIndex: -1
31143163
addedObject: {fileID: 1244070807}
@@ -7477,6 +7526,83 @@ RectTransform:
74777526
m_AnchoredPosition: {x: 0, y: 0}
74787527
m_SizeDelta: {x: 0, y: 28}
74797528
m_Pivot: {x: 0.5, y: 1}
7529+
--- !u!1 &2133285094
7530+
GameObject:
7531+
m_ObjectHideFlags: 0
7532+
m_CorrespondingSourceObject: {fileID: 0}
7533+
m_PrefabInstance: {fileID: 0}
7534+
m_PrefabAsset: {fileID: 0}
7535+
serializedVersion: 6
7536+
m_Component:
7537+
- component: {fileID: 2133285095}
7538+
- component: {fileID: 2133285097}
7539+
- component: {fileID: 2133285096}
7540+
- component: {fileID: 2133285098}
7541+
m_Layer: 0
7542+
m_Name: Plane
7543+
m_TagString: Untagged
7544+
m_Icon: {fileID: 0}
7545+
m_NavMeshLayer: 0
7546+
m_StaticEditorFlags: 0
7547+
m_IsActive: 1
7548+
--- !u!4 &2133285095
7549+
Transform:
7550+
m_ObjectHideFlags: 0
7551+
m_CorrespondingSourceObject: {fileID: 0}
7552+
m_PrefabInstance: {fileID: 0}
7553+
m_PrefabAsset: {fileID: 0}
7554+
m_GameObject: {fileID: 2133285094}
7555+
serializedVersion: 2
7556+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
7557+
m_LocalPosition: {x: 0, y: 0, z: 0}
7558+
m_LocalScale: {x: 0.47362724, y: 0.23802, z: 0.7292969}
7559+
m_ConstrainProportionsScale: 0
7560+
m_Children: []
7561+
m_Father: {fileID: 124887584}
7562+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7563+
--- !u!64 &2133285096
7564+
MeshCollider:
7565+
m_ObjectHideFlags: 0
7566+
m_CorrespondingSourceObject: {fileID: 0}
7567+
m_PrefabInstance: {fileID: 0}
7568+
m_PrefabAsset: {fileID: 0}
7569+
m_GameObject: {fileID: 2133285094}
7570+
m_Material: {fileID: 13400000, guid: 10bde48ef542d6a4fbee12145283824a, type: 2}
7571+
m_IncludeLayers:
7572+
serializedVersion: 2
7573+
m_Bits: 0
7574+
m_ExcludeLayers:
7575+
serializedVersion: 2
7576+
m_Bits: 0
7577+
m_LayerOverridePriority: 0
7578+
m_IsTrigger: 1
7579+
m_ProvidesContacts: 0
7580+
m_Enabled: 1
7581+
serializedVersion: 5
7582+
m_Convex: 1
7583+
m_CookingOptions: 30
7584+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
7585+
--- !u!33 &2133285097
7586+
MeshFilter:
7587+
m_ObjectHideFlags: 0
7588+
m_CorrespondingSourceObject: {fileID: 0}
7589+
m_PrefabInstance: {fileID: 0}
7590+
m_PrefabAsset: {fileID: 0}
7591+
m_GameObject: {fileID: 2133285094}
7592+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
7593+
--- !u!114 &2133285098
7594+
MonoBehaviour:
7595+
m_ObjectHideFlags: 0
7596+
m_CorrespondingSourceObject: {fileID: 0}
7597+
m_PrefabInstance: {fileID: 0}
7598+
m_PrefabAsset: {fileID: 0}
7599+
m_GameObject: {fileID: 2133285094}
7600+
m_Enabled: 1
7601+
m_EditorHideFlags: 0
7602+
m_Script: {fileID: 11500000, guid: 1223c7cba624f2543a906337cb292d86, type: 3}
7603+
m_Name:
7604+
m_EditorClassIdentifier:
7605+
cell: 0
74807606
--- !u!1 &2137979910
74817607
GameObject:
74827608
m_ObjectHideFlags: 0

Assets/Tap.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System.Runtime.InteropServices;
2+
using UnityEngine;
3+
4+
public class Tap : MonoBehaviour
5+
{
6+
7+
[DllImport("chunixr.dll")]
8+
private static extern void io_send_slider(uint index, bool value);
9+
10+
public int cell;
11+
12+
private void Start()
13+
{
14+
Debug.Log(cell);
15+
}
16+
17+
private void OnTriggerEnter(Collider Player)
18+
{
19+
io_send_slider((uint)cell, true);
20+
21+
Debug.Log("Ahhhh " + cell);
22+
}
23+
24+
private void OnTriggerExit(Collider Player)
25+
{
26+
io_send_slider((uint)cell, true);
27+
}
28+
}

Assets/Tap.cs.meta

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)