celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-21 20:08:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed triggers mesh collision to account for all faces

Browse Source
This commit is contained in:
Antoine Pilote
2021-07-02 03:30:12 -04:00
parent e5306bfed4
commit 68d276c4b6
10 changed files with 80 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Editor/resources/Scenes/test.scene
View File

@@ -2,12 +2,12 @@
"Entities": [
{
"NameComponent": {
"ID": 130924321,
"ID": -1986865524,
"Name": "testing"
},
"ParentComponent": {
"HasParent": true,
"ParentID": 130921466
"ParentID": -1986867378
},
"TransformComponent": {
"Rotation": {
@@ -30,7 +30,7 @@
},
{
"NameComponent": {
"ID": 130921466,
"ID": -1986867378,
"Name": "Brush 2"
},
"ParentComponent": {
@@ -58,12 +58,12 @@
},
{
"NameComponent": {
"ID": 130912441,
"ID": -1986874285,
"Name": "TestTrigger"
},
"ParentComponent": {
"HasParent": true,
"ParentID": 130909903
"ParentID": -1986876522
},
"TransformComponent": {
"Rotation": {
@@ -90,7 +90,7 @@
},
{
"NameComponent": {
"ID": 130909903,
"ID": -1986876522,
"Name": "Brush 1"
},
"ParentComponent": {
@@ -118,12 +118,12 @@
},
{
"NameComponent": {
"ID": 126715946,
"ID": -1990960415,
"Name": ""
},
"ParentComponent": {
"HasParent": true,
"ParentID": 126713557
"ParentID": -1990962787
},
"TransformComponent": {
"Rotation": {
@@ -146,7 +146,7 @@
},
{
"NameComponent": {
"ID": 126713557,
"ID": -1990962787,
"Name": "Brush 0"
},
"ParentComponent": {
@@ -173,18 +173,9 @@
}
},
{
"CameraComponent": {
"CameraInstance": {
"AspectRatio": 1.9246861934661865,
"Exposure": 1.0,
"Fov": 88.0,
"Speed": 1.0,
"m_Type": 1
}
},
"NameComponent": {
"ID": 237481018,
"Name": "Camera"
"ID": -1598095916,
"Name": "Model"
},
"ParentComponent": {
"HasParent": false
@@ -192,7 +183,7 @@
"TransformComponent": {
"Rotation": {
"x": 0.0,
"y": -0.0,
"y": 0.0,
"z": 0.0
},
"Scale": {
@@ -201,15 +192,11 @@
"z": 1.0
},
"Translation": {
"x": 6.100314617156982,
"y": -49.37096405029297,
"z": -5.69704008102417
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"Type": "TransformComponent"
},
"WrenScriptComponent": {
"Class": "CamScript",
"Script": "Scripts/Cam.wren"
}
},
{
@@ -328,9 +315,18 @@
}
},
{
"CameraComponent": {
"CameraInstance": {
"AspectRatio": 1.9246861934661865,
"Exposure": 1.0,
"Fov": 88.0,
"Speed": 1.0,
"m_Type": 1
}
},
"NameComponent": {
"ID": -1598095916,
"Name": "Model"
"ID": 237481018,
"Name": "Camera"
},
"ParentComponent": {
"HasParent": false
@@ -338,7 +334,7 @@
"TransformComponent": {
"Rotation": {
"x": 0.0,
"y": 0.0,
"y": -0.0,
"z": 0.0
},
"Scale": {
@@ -347,11 +343,15 @@
"z": 1.0
},
"Translation": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"x": 6.100314617156982,
"y": -49.37096405029297,
"z": -5.69704008102417
},
"Type": "TransformComponent"
},
"WrenScriptComponent": {
"Class": "CamScript",
"Script": "Scripts/Cam.wren"
}
}
],

4
Editor/resources/Scripts/Cam.wren
View File

@@ -76,5 +76,9 @@ class CamScript is ScriptableEntity {
cam.SetDirection(newDir)
}
fixedUpdate(ts) {
}
exit() {}
}

1
Editor/resources/Scripts/Scene.wren
View File

@@ -204,6 +204,7 @@ class Brush {
var entities = []
var targets = Scene.BrushGetTargets_(_entityId)
for(t in targets) {
entities.add(Entity.new(t))
}

4
Editor/resources/Scripts/Trigger.wren
View File

@@ -18,7 +18,7 @@ class TriggerScript is ScriptableEntity {
fixedUpdate(ts) {
var trigger = this.GetComponent("Trigger")
Engine.Log("Hello")
if(trigger.GetOverlappingBodyCount() > 0) {
var bodies = trigger.GetOverlappingBodies()
var brush = this.GetComponent("Brush")
@@ -32,7 +32,7 @@ class TriggerScript is ScriptableEntity {
for(t in brush.GetTargets()) {
var transform = t.GetComponent("Transform")
var pos = transform.GetTranslation()
Engine.Log("Hello")
pos.x = pos.x + 1.0 * ts
transform.SetTranslation(pos)

4
Editor/resources/Scripts/entityScript.wren
View File

@@ -15,6 +15,10 @@ class TestScript is ScriptableEntity {
_deltaTime = _deltaTime + ts
}
fixedUpdate(ts) {
}
exit() {