From ca252b06763fe85102d79bd585653e572b97416c Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Wed, 3 Aug 2016 03:34:41 -0400
Subject: [PATCH] ecere/gfx: Moved CubeMap to Bitmap.ec

---
 ecere/src/gfx/Bitmap.ec                    | 27 +++++++++++++++++++++++++++
 ecere/src/gfx/drivers/gl3/defaultShader.ec | 28 ----------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/ecere/src/gfx/Bitmap.ec b/ecere/src/gfx/Bitmap.ec
index cd01e7b..c1d3725 100644
--- a/ecere/src/gfx/Bitmap.ec
+++ b/ecere/src/gfx/Bitmap.ec
@@ -945,3 +945,30 @@ public:
       return palette;
    }
 };
+
+public class CubeMap : Bitmap
+{
+public:
+   void Load(DisplaySystem displaySystem, const String * names, const String extension, bool oldStyle)
+   {
+      int i;
+      for(i = 0; i < 6; i++)
+      {
+         char location[MAX_LOCATION];
+         Bitmap face = i > 0 ? { } : this;
+         strcpy(location, names[i]);
+         if(extension)
+            ChangeExtension(location, extension, location);
+         if(face.Load(location, null, null))
+         {
+            face.driverData = driverData;
+            displaySystem.driver.MakeDDBitmap(displaySystem, face, true, (i + 1) | (oldStyle << 3));
+         }
+         if(i > 0)
+         {
+            face.driverData = 0;
+            delete face;
+         }
+      }
+   }
+};
diff --git a/ecere/src/gfx/drivers/gl3/defaultShader.ec b/ecere/src/gfx/drivers/gl3/defaultShader.ec
index edb74cd..1f52d97 100644
--- a/ecere/src/gfx/drivers/gl3/defaultShader.ec
+++ b/ecere/src/gfx/drivers/gl3/defaultShader.ec
@@ -4,34 +4,6 @@ import "shaders"
 
 namespace gfx::drivers;
 
-public class CubeMap : Bitmap
-{
-public:
-   void Load(DisplaySystem displaySystem, const String * names, const String extension, bool oldStyle)
-   {
-      int i;
-      for(i = 0; i < 6; i++)
-      {
-         char location[MAX_LOCATION];
-         Bitmap face = i > 0 ? { } : this;
-         strcpy(location, names[i]);
-         if(extension)
-            ChangeExtension(location, extension, location);
-         if(face.Load(location, null, null))
-         {
-            face.driverData = driverData;
-            displaySystem.driver.MakeDDBitmap(displaySystem, face, true, (i + 1) | (oldStyle << 3));
-         }
-         if(i > 0)
-         {
-            face.driverData = 0;
-            delete face;
-         }
-      }
-   }
-};
-
-
 // **********   Default Shader   **********
 public enum LightMode { off, dir, pos, posAtt, posSpot, posSpotAtt };
 public enum SwizzleMode { off, alpha, red };
-- 
1.8.3.1