moved some stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gate.h

diff --git a/world_gate.h b/world_gate.h
index 89945b94a031a16b467db081f5b18503c4cb44ec..39a1e78d39dffdf8b2ff6f6034afd24aa039f910 100644 (file)
--- a/world_gate.h
+++ b/world_gate.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #ifndef WORLD_GATE_H
 #define WORLD_GATE_H
 
@@ -16,8 +20,6 @@
 #include "world_water.h"
 
 
-typedef struct teleport_gate teleport_gate;
-
 static struct
 {
    struct framebuffer fb;
@@ -139,13 +141,13 @@ static int render_gate( teleport_gate *gate, v3f viewpos, m4x3f camera )
       glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
 #else
       shader_gatelq_use();
-      shader_gatelq_uPv( vg_pv );
+      shader_gatelq_uPv( vg.pv );
       shader_gatelq_uMdl( gate_xform );
       shader_gatelq_uCam( viewpos );
-      shader_gatelq_uTime( vg_time*0.25f );
+      shader_gatelq_uTime( vg.time*0.25f );
       shader_gatelq_uInvRes( (v2f){
-            1.0f / (float)vg_window_x,
-            1.0f / (float)vg_window_y });
+            1.0f / (float)vg.window_x,
+            1.0f / (float)vg.window_y });
 
       glEnable( GL_STENCIL_TEST );
       glStencilOp( GL_KEEP, GL_KEEP, GL_REPLACE );