Skip to content

Add collision event handling to CilboxProxy #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dooly123 merged 1 commit into from
Mar 1, 2026
Merged

Add collision event handling to CilboxProxy #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Basis/Packages/com.basis.shim/Shims/CilboxPropBasis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ public class CilboxPropBasis : Cilbox
{
static HashSet<String> whiteListType = new HashSet<String>(){
// Basis types
"Basis.Scripts.BasisSdk.Interactions.BasisPickUpUseMode",
"Basis.Scripts.Device_Management.Devices.BasisInput", // Restrictive, only used as a type.
"Basis.Scripts.BasisSdk.Interactions.BasisPickupInteractable", // Restrictive (See below), only access field.
"Basis.Scripts.BasisSdk.Interactions.BasisInteractableObject",

// Cilbox types
"Cilbox.CilboxPublicUtils",
Expand Down Expand Up @@ -53,6 +57,8 @@ public class CilboxPropBasis : Cilbox
"UnityEngine.AudioSource",
"UnityEngine.Color",
"UnityEngine.Component",
"UnityEngine.Collider",
"UnityEngine.Collision",
"UnityEngine.Debug",
"UnityEngine.Events.UnityAction",
"UnityEngine.Events.UnityEvent",
Expand All @@ -70,6 +76,7 @@ public class CilboxPropBasis : Cilbox
"UnityEngine.Texture2D",
"UnityEngine.Time",
"UnityEngine.Transform",
"UnityEngine.Quaternion",
"UnityEngine.UI.Button",
"UnityEngine.UI.Button+ButtonClickedEvent",
"UnityEngine.UI.InputField",
Expand All @@ -80,21 +87,18 @@ public class CilboxPropBasis : Cilbox
"UnityEngine.UI.Text",
"UnityEngine.Vector3",
"UnityEngine.Vector4",

"Basis.Scripts.BasisSdk.Interactions.BasisPickUpUseMode",
"Basis.Scripts.Device_Management.Devices.BasisInput", // Restrictive, only used as a type.
"Basis.Scripts.BasisSdk.Interactions.BasisPickupInteractable", // Restrictive (See below), only access field.
"Basis.Scripts.BasisSdk.Interactions.BasisInteractableObject",
};

static HashSet<String> whiteListFields = new HashSet<String>(){
// Unity fields
"UnityEngine.Vector3.x",
"UnityEngine.Vector3.y",
"UnityEngine.Vector3.z",

// Basis types
"Basis.Scripts.BasisSdk.Interactions.BasisPickupInteractable.OnPickupUse",
"Basis.Scripts.BasisSdk.Interactions.BasisInteractableObject.OnInteractStartEvent",
"Basis.Scripts.BasisSdk.Interactions.BasisInteractableObject.OnInteractEndEvent",
"Basis.Scripts.BasisSdk.Interactions.BasisInteractableObject.OnInteractEndEvent",
};

static public HashSet<String> GetWhiteListTypes() { return whiteListType; }
Expand Down
2 changes: 2 additions & 0 deletions Basis/Packages/com.cnlohr.cilbox/Cilbox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2875,6 +2875,8 @@ public enum ImportFunctionID
OnTriggerExit,
OnEnable,
OnDisable,
OnCollisionEnter,
OnCollisionExit
}
}

4 changes: 3 additions & 1 deletion Basis/Packages/com.cnlohr.cilbox/CilboxProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,9 @@ void Start() {
void Update() { if( proxyWasSetup ) box.InterpretIID( cls, this, ImportFunctionID.Update, null ); }
void FixedUpdate() { if( proxyWasSetup ) box.InterpretIID( cls, this, ImportFunctionID.FixedUpdate, null ); }
void OnTriggerEnter(Collider c) { if (proxyWasSetup) box.InterpretIID(cls, this, ImportFunctionID.OnTriggerEnter, new object[] { c }); }
void OnTriggerExit(Collider b) { if (proxyWasSetup) box.InterpretIID(cls, this, ImportFunctionID.OnTriggerExit, new object[] { b }); }
void OnTriggerExit(Collider c) { if (proxyWasSetup) box.InterpretIID(cls, this, ImportFunctionID.OnTriggerExit, new object[] { c }); }
void OnCollisionEnter(Collision c) { if (proxyWasSetup) box.InterpretIID(cls, this, ImportFunctionID.OnCollisionEnter, new object[] { c }); }
void OnCollisionExit(Collision c) { if (proxyWasSetup) box.InterpretIID(cls, this, ImportFunctionID.OnCollisionExit, new object[] { c }); }
}
}

Loading