projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show error messages if trying to connect to server
[carveJwlIkooP6JGAAIwe30JlM.git]
/
pointcloud.h
diff --git
a/pointcloud.h
b/pointcloud.h
index 427548caa3e164b18ad74f6b5df3e3e864cb8522..89621a4613d800364049de09f3f55f1eaa343174 100644
(file)
--- a/
pointcloud.h
+++ b/
pointcloud.h
@@
-1,4
+1,5
@@
-#ifndef POINTCLOUD_H
+#if 0
+//#ifndef POINTCLOUD_H
#define POINTCLOUD_H
#include "common.h"
#define POINTCLOUD_H
#include "common.h"
@@
-111,8
+112,7
@@
static int pointcloud_idle(void){
else return 0;
}
else return 0;
}
-static
-void pointcloud_render( world_instance *world, camera *cam, m4x3f model ){
+static void pointcloud_render( camera *cam, m4x3f model ){
if( pointcloud.anim < k_pointcloud_anim_idle_any ){
f32 const k_transition = 0.6f;
f32 t = (vg.time - pointcloud.anim_start) / k_transition;
if( pointcloud.anim < k_pointcloud_anim_idle_any ){
f32 const k_transition = 0.6f;
f32 t = (vg.time - pointcloud.anim_start) / k_transition;
@@
-160,4
+160,13
@@
static void pointcloud_packvert( pointcloud_vert *vert, v3f pos, v4f colour ){
vert->colour[i] = colour[i] * 255.0f;
}
vert->colour[i] = colour[i] * 255.0f;
}
+static void pointcloud_async_end(void *_, u32 __){
+ pointcloud_animate( k_pointcloud_anim_opening );
+}
+
+static void pointcloud_clear_async(void *_, u32 __){
+ pointcloud.count = 0;
+ pointcloud_animate( k_pointcloud_anim_opening );
+}
+
#endif /* POINTCLOUD_H */
#endif /* POINTCLOUD_H */