projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fuckin hell
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_sfd.h
diff --git
a/world_sfd.h
b/world_sfd.h
index 9f41992bc84de7d43e42634797bd9d22038cc7a1..3fbbe949482a775ebba620a53b71e25b36f86c50 100644
(file)
--- a/
world_sfd.h
+++ b/
world_sfd.h
@@
-7,8
+7,10
@@
#include "world.h"
#include "world.h"
+#if 0
#include "shaders/scoretext.h"
#include "shaders/vblend.h"
#include "shaders/scoretext.h"
#include "shaders/vblend.h"
+#endif
vg_tex2d tex_scoretext = { .path = "textures/scoretext.qoi",
.flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST };
vg_tex2d tex_scoretext = { .path = "textures/scoretext.qoi",
.flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST };
@@
-104,8
+106,8
@@
VG_STATIC void sfd_update(void)
VG_STATIC void bind_terrain_noise(void);
VG_STATIC void sfd_render( camera *cam, m4x3f transform )
{
VG_STATIC void bind_terrain_noise(void);
VG_STATIC void sfd_render( camera *cam, m4x3f transform )
{
+#if 0
mesh_bind( &world.sfd.mesh_display );
mesh_bind( &world.sfd.mesh_display );
-
shader_scoretext_use();
shader_scoretext_uTexGarbage(0);
shader_scoretext_uTexGradients(1);
shader_scoretext_use();
shader_scoretext_uTexGarbage(0);
shader_scoretext_uTexGradients(1);
@@
-147,6
+149,7
@@
VG_STATIC void sfd_render( camera *cam, m4x3f transform )
mesh_bind( &world.sfd.mesh_base );
mesh_draw( &world.sfd.mesh_base );
mesh_bind( &world.sfd.mesh_base );
mesh_draw( &world.sfd.mesh_base );
+#endif
}
VG_STATIC int world_sfd_test( int argc, const char *argv[] )
}
VG_STATIC int world_sfd_test( int argc, const char *argv[] )
@@
-163,7
+166,10
@@
VG_STATIC int world_sfd_test( int argc, const char *argv[] )
VG_STATIC void world_sfd_init(void)
{
vg_info( "world_sfd_init\n" );
VG_STATIC void world_sfd_init(void)
{
vg_info( "world_sfd_init\n" );
+
+#if 0
shader_scoretext_register();
shader_scoretext_register();
+#endif
vg_function_push( (struct vg_cmd){
.name = "sfd",
vg_function_push( (struct vg_cmd){
.name = "sfd",
@@
-184,11
+190,13
@@
VG_STATIC void world_sfd_init(void)
m4x3f identity;
m4x3_identity( identity );
m4x3f identity;
m4x3_identity( identity );
+ /* FIXME: dont use scene header for this you fucking idiots */
for( int i=4;i<6;i++ )
{
u32 vert_start = sc->vertex_count;
for( int i=4;i<6;i++ )
{
u32 vert_start = sc->vertex_count;
- scene_add_submesh( sc, mboard, card, identity );
+ scene_add_
mdl_
submesh( sc, mboard, card, identity );
+#if 0
for( int j=0; j<card->vertex_count; j++ )
{
mdl_vert *vert = &sc->arrvertices[ vert_start+j ];
for( int j=0; j<card->vertex_count; j++ )
{
mdl_vert *vert = &sc->arrvertices[ vert_start+j ];
@@
-198,6
+206,7
@@
VG_STATIC void world_sfd_init(void)
vert->colour[0] = 0.0f;
vert->colour[1] = i*36;
}
vert->colour[0] = 0.0f;
vert->colour[1] = i*36;
}
+#endif
}
vg_acquire_thread_sync();
}
vg_acquire_thread_sync();