revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gate.h

diff --git a/world_gate.h b/world_gate.h
index 151e428ff7be1172dd9d761572ac2cc097a91f33..03e45685b16b2c1b3908a2039cce8508c0203939 100644 (file)
--- a/world_gate.h
+++ b/world_gate.h
@@ -1,37 +1,35 @@
 /*
- * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
-#ifndef WORLD_GATE_H
-#define WORLD_GATE_H
+#pragma once
 
-#include "camera.h"
+#include "vg/vg_camera.h"
 #include "world.h"
 #include "shaders/model_gate.h"
 
-struct world_gates{
+struct world_gates
+{
    glmesh mesh;
    mdl_submesh sm_surface, sm_marker[4];
-   camera cam;
+   vg_camera cam;
 
    v3f userportal_co;
 }
-static world_gates;
+extern world_gates;
 
-static void world_gates_init(void);
-static void gate_transform_update( ent_gate *gate );
-static int render_gate( world_instance *world, world_instance *world_inside,
-                           ent_gate *gate, camera *cam );
+void world_gates_init(void);
+void gate_transform_update( ent_gate *gate );
+int render_gate( world_instance *world, world_instance *world_inside,
+                    ent_gate *gate, vg_camera *cam );
 
-static int gate_intersect( ent_gate *gate, v3f pos, v3f last );
-static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last );
+int gate_intersect( ent_gate *gate, v3f pos, v3f last );
+u32 world_intersect_gates( world_instance *world, v3f pos, v3f last );
 
-static void ent_gate_call( world_instance *world, ent_call *call );
-static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl );
+void ent_gate_call( world_instance *world, ent_call *call );
+void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl );
 
-static void world_link_nonlocal_async( void *payload, u32 size );
-static void world_unlink_nonlocal( world_instance *world );
-static void render_gate_unlinked( world_instance *world,
-                                  ent_gate *gate, camera *cam );
-
-#endif /* WORLD_GATE_H */
+void world_link_nonlocal_async( void *payload, u32 size );
+void world_unlink_nonlocal( world_instance *world );
+void render_gate_unlinked( world_instance *world,
+                           ent_gate *gate, vg_camera *cam );