projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge all features from glider feature branch
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_routes.c
diff --git
a/world_routes.c
b/world_routes.c
index daba459fd6b50ba2ab67f337110abfc8d75924f9..105e5467726d7d9c4b798f255bb48eb02dd80ddd 100644
(file)
--- a/
world_routes.c
+++ b/
world_routes.c
@@
-1,10
+1,11
@@
+#pragma once
+
/*
/*
- * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software - All Rights Reserved
+ *
+ * World routes
*/
*/
-#ifndef ROUTES_C
-#define ROUTES_C
-
#include <time.h>
#include "entity.h"
#include "world_routes.h"
#include <time.h>
#include "entity.h"
#include "world_routes.h"
@@
-21,6
+22,7
@@
#include "shaders/scene_route.h"
#include "shaders/routeui.h"
#include "ent_region.h"
#include "shaders/scene_route.h"
#include "shaders/routeui.h"
#include "ent_region.h"
+#include "scene_rigidbody.h"
static void world_routes_clear( world_instance *world )
{
static void world_routes_clear( world_instance *world )
{
@@
-666,27
+668,31
@@
static void world_routes_update( world_instance *world ){
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_object_debug( &particle->obj, VG__RED );
+
//
rb_object_debug( &particle->obj, VG__RED );
}
}
static void world_routes_fixedupdate( world_instance *world ){
rb_solver_reset();
}
}
static void world_routes_fixedupdate( world_instance *world ){
rb_solver_reset();
+ rigidbody _null = {0};
+ _null.inv_mass = 0.0f;
+ m3x3_zero( _null.iI );
+
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
if( rb_global_has_space() ){
rb_ct *buf = rb_global_buffer();
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
if( rb_global_has_space() ){
rb_ct *buf = rb_global_buffer();
- int l = rb_sphere__scene( particle->
obj.
rb.to_world,
-
&particle->obj.inf.sphere
,
- NULL,
&world->rb_geo.inf.scene
, buf,
+ int l = rb_sphere__scene( particle->rb.to_world,
+
particle->radius
,
+ NULL,
world->geo_bh
, buf,
k_material_flag_ghosts );
for( int j=0; j<l; j++ ){
k_material_flag_ghosts );
for( int j=0; j<l; j++ ){
- buf[j].rba = &particle->
obj.
rb;
- buf[j].rbb = &
world->rb_geo.rb
;
+ buf[j].rba = &particle->rb;
+ buf[j].rbb = &
_null
;
}
rb_contact_count += l;
}
rb_contact_count += l;
@@
-705,12
+711,12
@@
static void world_routes_fixedupdate( world_instance *world ){
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_iter( &particle->
obj.
rb );
+ rb_iter( &particle->rb );
}
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
}
for( u32 i=0; i<world_render.text_particle_count; i++ ){
struct text_particle *particle = &world_render.text_particles[i];
- rb_update_
transform( &particle->obj.
rb );
+ rb_update_
matrices( &particle->
rb );
}
}
}
}
@@
-878,26
+884,24
@@
static void world_routes_fracture( world_instance *world, ent_gate *gate,
v3_add( offset, origin, world_co );
m4x3_mulv( transform, world_co, world_co );
v3_add( offset, origin, world_co );
m4x3_mulv( transform, world_co, world_co );
- float r = vg_maxf( s[0]*glyph->size[0], s[1]*glyph->size[1] )*0.5f;
m3x3_identity( particle->mlocal );
m3x3_scale( particle->mlocal, s );
origin[2] *= s[2];
v3_muls( origin, -1.0f, particle->mlocal[3] );
m3x3_identity( particle->mlocal );
m3x3_scale( particle->mlocal, s );
origin[2] *= s[2];
v3_muls( origin, -1.0f, particle->mlocal[3] );
- v3_copy( world_co, particle->
obj.
rb.co );
- v3_muls( imp_v, 1.0f+vg_randf64(&vg.rand), particle->
obj.
rb.v );
- particle->
obj.
rb.v[1] += 2.0f;
+ v3_copy( world_co, particle->rb.co );
+ v3_muls( imp_v, 1.0f+vg_randf64(&vg.rand), particle->rb.v );
+ particle->rb.v[1] += 2.0f;
- v4_copy( q, particle->
obj.
rb.q );
- particle->
obj.
rb.w[0] = vg_randf64(&vg.rand)*2.0f-1.0f;
- particle->
obj.
rb.w[1] = vg_randf64(&vg.rand)*2.0f-1.0f;
- particle->
obj.
rb.w[2] = vg_randf64(&vg.rand)*2.0f-1.0f;
+ v4_copy( q, particle->rb.q );
+ particle->rb.w[0] = vg_randf64(&vg.rand)*2.0f-1.0f;
+ particle->rb.w[1] = vg_randf64(&vg.rand)*2.0f-1.0f;
+ particle->rb.w[2] = vg_randf64(&vg.rand)*2.0f-1.0f;
- particle->obj.type = k_rb_shape_sphere;
- particle->obj.inf.sphere.radius = r*0.6f;
-
- rb_init_object( &particle->obj, 1.0f );
+ f32 r = vg_maxf( s[0]*glyph->size[0], s[1]*glyph->size[1] )*0.5f;
+ particle->radius = r*0.6f;
+ rb_setbody_sphere( &particle->rb, particle->radius, 1.0f, 1.0f );
}
offset[0] += glyph->size[0];
}
}
offset[0] += glyph->size[0];
}
@@
-1009,7
+1013,7
@@
static void render_world_routes( world_instance *world,
v4f q;
m4x3f model;
v4f q;
m4x3f model;
- rb_extrapolate( &particle->
obj.
rb, model[3], q );
+ rb_extrapolate( &particle->rb, model[3], q );
q_m3x3( q, model );
m4x3_mul( model, particle->mlocal, particle->mdl );
q_m3x3( q, model );
m4x3_mul( model, particle->mlocal, particle->mdl );
@@
-1080,5
+1084,3
@@
static void render_world_routes( world_instance *world,
glEnable( GL_CULL_FACE );
glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } );
}
glEnable( GL_CULL_FACE );
glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } );
}
-
-#endif /* ROUTES_C */