Evacuates global namespace

scripts/CardboardBatchAutoGet/CardboardBatchAutoGet.gml

@@ -2,5 +2,7 @@
 
 function CardboardBatchAutoGet()
 {
-    return global.__cardboardAutoBatching;
+    __CARDBOARD_GLOBAL
+
+    return _global.__autoBatching;
 }

scripts/CardboardBatchAutoSet/CardboardBatchAutoSet.gml

@@ -4,5 +4,7 @@
 
 function CardboardBatchAutoSet(_state)
 {
-    global.__cardboardAutoBatching = _state;
+    __CARDBOARD_GLOBAL
+
+    _global.__autoBatching = _state;
 }

scripts/CardboardBatchForceSubmit/CardboardBatchForceSubmit.gml

@@ -4,21 +4,26 @@
 
 function CardboardBatchForceSubmit()
 {
-    if (global.__cardboardBuildingModel) __CardboardError("Cannot force submit a batch whilst creating a model");
+    __CARDBOARD_GLOBAL
 
-    //Don't do anything we know this batch is empty
-    if (global.__cardboardBatchTexturePointer == undefined) return;
-
-    //Submit the batch we have
-    vertex_end(global.__cardboardBatchVertexBuffer);
-    vertex_submit(global.__cardboardBatchVertexBuffer, pr_trianglelist, global.__cardboardBatchTexturePointer);
-    vertex_delete_buffer(global.__cardboardBatchVertexBuffer);
-
-    //Clear the batch's texture state
-    global.__cardboardBatchTexturePointer = undefined;
-    global.__cardboardBatchTextureIndex   = undefined;
-
-    //Then start the vertex buffer again!
-    global.__cardboardBatchVertexBuffer = vertex_create_buffer();
-    vertex_begin(global.__cardboardBatchVertexBuffer, global.__cardboardVertexFormat);
+    with(_global)
+    {
+        if (__buildingModel) __CardboardError("Cannot force submit a batch whilst creating a model");
+
+        //Don't do anything we know this batch is empty
+        if (__batchTexturePointer == undefined) return;
+
+        //Submit the batch we have
+        vertex_end(__batchVertexBuffer);
+        vertex_submit(__batchVertexBuffer, pr_trianglelist, __batchTexturePointer);
+        vertex_delete_buffer(__batchVertexBuffer);
+
+        //Clear the batch's texture state
+        __batchTexturePointer = undefined;
+        __batchTextureIndex   = undefined;
+
+        //Then start the vertex buffer again!
+        __batchVertexBuffer = vertex_create_buffer();
+        vertex_begin(__batchVertexBuffer, __vertexFormat);
+    }
 }

scripts/CardboardBatchNewVertexBuffer/CardboardBatchNewVertexBuffer.gml

@@ -10,12 +10,14 @@
 
 function CardboardBatchNewVertexBuffer(_texture)
 {
-    if (global.__cardboardBuildingModel) __CardboardError("Cannot use CardboardBatchNewVertexBuffer() whilst a model is being built\nUse CardboardModelNewVertexBuffer() to instead");
+    __CARDBOARD_GLOBAL
+
+    if (_global.__buildingModel) __CardboardError("Cannot use CardboardBatchNewVertexBuffer() whilst a model is being built\nUse CardboardModelNewVertexBuffer() to instead");
 
     CardboardBatchForceSubmit();
 
-    global.__cardboardBatchTexturePointer = _texture;
-    global.__cardboardBatchTextureIndex   = undefined;
+    _global.__batchTexturePointer = _texture;
+    _global.__batchTextureIndex   = undefined;
 
-    return global.__cardboardBatchVertexBuffer;
+    return _global.__batchVertexBuffer;
 }

scripts/CardboardBillboardYawGet/CardboardBillboardYawGet.gml

@@ -0,0 +1,8 @@
+/// Returns the yaw angle used for Cardboard's billboarded sprites
+
+function CardboardBillboardYawGet()
+{
+    __CARDBOARD_GLOBAL
+
+    return _global.__billboardYaw;
+}

scripts/CardboardModelBegin/CardboardModelBegin.gml

@@ -6,10 +6,12 @@
 
 function CardboardModelBegin()
 {
-    if (global.__cardboardBuildingModel) __CardboardError("Only one model can be created at a time");
+    __CARDBOARD_GLOBAL
+
+    if (_global.__buildingModel) __CardboardError("Only one model can be created at a time");
 
     __CardboardBatchComplete();
 
-    global.__cardboardBuildingModel = true;
-    global.__cardboardModel = new __CardboardClassModel();
+    _global.__buildingModel = true;
+    _global.__model = new __CardboardClassModel();
 }

scripts/CardboardModelEnd/CardboardModelEnd.gml

@@ -6,14 +6,16 @@
 
 function CardboardModelEnd()
 {
-    if (!global.__cardboardBuildingModel) __CardboardError("No model has been created");
+    __CARDBOARD_GLOBAL
+
+    if (!_global.__buildingModel) __CardboardError("No model has been created");
 
     __CardboardBatchComplete();
 
-    var _model = global.__cardboardModel;
+    var _model = _global.__model;
 
-    global.__cardboardBuildingModel = false;
-    global.__cardboardModel         = undefined;
+    _global.__buildingModel = false;
+    _global.__model         = undefined;
 
     return _model;
 }

scripts/CardboardModelNewVertexBuffer/CardboardModelNewVertexBuffer.gml

@@ -10,12 +10,14 @@
 
 function CardboardModelNewVertexBuffer(_texture)
 {
-    if (!global.__cardboardBuildingModel) __CardboardError("Cannot use CardboardModelNewVertexBuffer() when a model is not being built\nUse CardboardBatchNewVertexBuffer() to instead");
+    __CARDBOARD_GLOBAL
 
-    global.__cardboardModel.__AddBatch();
+    if (!_global.__buildingModel) __CardboardError("Cannot use CardboardModelNewVertexBuffer() when a model is not being built\nUse CardboardBatchNewVertexBuffer() to instead");
 
-    global.__cardboardBatchTexturePointer = _texture;
-    global.__cardboardBatchTextureIndex   = undefined;
+    _global.__model.__AddBatch();
 
-    return global.__cardboardBatchVertexBuffer;
+    _global.__batchTexturePointer = _texture;
+    _global.__batchTextureIndex   = undefined;
+
+    return _global.__batchVertexBuffer;
 }

scripts/CardboardRenderStateReset/CardboardRenderStateReset.gml

@@ -2,6 +2,8 @@
 
 function CardboardRenderStateReset()
 {
+    __CARDBOARD_GLOBAL
+
     //If we've got a pending batch then submit that before resetting draw state
     CardboardBatchForceSubmit();
 
@@ -12,7 +14,7 @@ function CardboardRenderStateReset()
     gpu_set_alphatestenable(false);
 
     //Restore the old matrices we've been using
-    matrix_set(matrix_world,      global.__cardboardOldWorld);
-    matrix_set(matrix_view,       global.__cardboardOldView);
-    matrix_set(matrix_projection, global.__cardboardOldProjection);
+    matrix_set(matrix_world,      _global.__oldRenderStateMatrixWorld);
+    matrix_set(matrix_view,       _global.__oldRenderStateMatrixView);
+    matrix_set(matrix_projection, _global.__oldRenderStateMatrixProjection);
 }