projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
formatting
[carveJwlIkooP6JGAAIwe30JlM.git]
/
physics_test.h
diff --git
a/physics_test.h
b/physics_test.h
index acf4ed3cd96c6e46183b3995a81093075a51601d..243de364933859c3d08881c5584fcf9295cfba08 100644
(file)
--- a/
physics_test.h
+++ b/
physics_test.h
@@
-1,3
+1,7
@@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
#ifndef PHYSICS_TEST_H
#define PHYSICS_TEST_H
#ifndef PHYSICS_TEST_H
#define PHYSICS_TEST_H
@@
-22,7
+26,7
@@
rigidbody blocky =
rigidbody marko =
{
.type = k_rb_shape_box,
rigidbody marko =
{
.type = k_rb_shape_box,
- .bbx = {{-
2.0f,-2.0f,-2.0f},{2.0f,2.0f,2.0
f}},
+ .bbx = {{-
0.5f,-0.5f,-0.5f},{0.5f,0.5f,0.5
f}},
.co = {-36.0f,8.0f,-36.0f},
.q = {0.0f,0.0f,0.0f,1.0f},
.is_world = 0
.co = {-36.0f,8.0f,-36.0f},
.q = {0.0f,0.0f,0.0f,1.0f},
.is_world = 0
@@
-73,7
+77,7
@@
rigidbody jeff1 = { .type = k_rb_shape_capsule,
};
rigidbody ball = { .type = k_rb_shape_sphere,
};
rigidbody ball = { .type = k_rb_shape_sphere,
- .inf.sphere = { .radius =
4
.0f },
+ .inf.sphere = { .radius =
2
.0f },
.co = {0.0f,20.0f,2.0f},
.q = {0.0f,0.0f,0.0f,1.0f}},
.co = {0.0f,20.0f,2.0f},
.q = {0.0f,0.0f,0.0f,1.0f}},
@@
-88,8
+92,6
@@
static void reorg_jeffs(void)
{
for( int i=0; i<vg_list_size(jeffs); i++ )
{
{
for( int i=0; i<vg_list_size(jeffs); i++ )
{
- v3_zero( jeffs[i].v );
- v3_zero( jeffs[i].w );
v3_copy( (v3f){ (vg_randf()-0.5f) * 10.0f,
(vg_randf()-0.5f) * 10.0f + 17.0f,
(vg_randf()-0.5f) * 10.0f }, jeffs[i].co );
v3_copy( (v3f){ (vg_randf()-0.5f) * 10.0f,
(vg_randf()-0.5f) * 10.0f + 17.0f,
(vg_randf()-0.5f) * 10.0f }, jeffs[i].co );
@@
-99,7
+101,7
@@
static void reorg_jeffs(void)
jeffs[i].type = k_rb_shape_capsule;
jeffs[i].inf.capsule.radius = 0.75f;
jeffs[i].type = k_rb_shape_capsule;
jeffs[i].inf.capsule.radius = 0.75f;
- jeffs[i].inf.capsule.height =
8
.0f;
+ jeffs[i].inf.capsule.height =
3
.0f;
rb_init( &jeffs[i] );
}
rb_init( &jeffs[i] );
}
@@
-141,7
+143,7
@@
static void physics_test_start(void)
}
}
}
}
- free( mdl );
+
vg_
free( mdl );
scene_bh_create( &epic_scene );
rb_init( &epic_scene_rb );
scene_bh_create( &epic_scene );
rb_init( &epic_scene_rb );
@@
-229,26
+231,26
@@
static void physics_test_update(void)
/* POSITION OVERRIDE */
{
/* POSITION OVERRIDE */
{
- if(glfwGetKey( vg
_
window, GLFW_KEY_L ))
+ if(glfwGetKey( vg
.
window, GLFW_KEY_L ))
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, marko.co );
v3_zero( marko.v );
v3_zero( marko.w );
}
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, marko.co );
v3_zero( marko.v );
v3_zero( marko.w );
}
- if(glfwGetKey( vg
_
window, GLFW_KEY_K ))
+ if(glfwGetKey( vg
.
window, GLFW_KEY_K ))
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, ball.co );
v3_zero( ball.v );
v3_zero( ball.w );
}
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, ball.co );
v3_zero( ball.v );
v3_zero( ball.w );
}
- if(glfwGetKey( vg
_
window, GLFW_KEY_J ))
+ if(glfwGetKey( vg
.
window, GLFW_KEY_J ))
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, ball1.co );
v3_zero( ball1.v );
v3_zero( ball1.w );
}
{
m4x3_mulv( player.camera, (v3f){0.0f,0.0f,-5.0f}, ball1.co );
v3_zero( ball1.v );
v3_zero( ball1.w );
}
- if(glfwGetKey( vg
_
window, GLFW_KEY_H ))
+ if(glfwGetKey( vg
.
window, GLFW_KEY_H ))
{
reorg_jeffs();
}
{
reorg_jeffs();
}