Graphics.Rendering.GLU.Raw => Graphics.GLU

haskell-opengl · Dec 30, 2015 · aadd126 · aadd126
1 parent a7d75ae
commit aadd126
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 2.0.0.0
 -------
+* Changed module name prefix from `Graphics.Rendering.GLU.Raw` to `Graphics.GLU`.
+
 
 1.5.0.3
 -------

diff --git a/GLURaw.cabal b/GLURaw.cabal
@@ -33,13 +33,13 @@ flag UseNativeWindowsLibraries
 
 library
   exposed-modules:
-    Graphics.Rendering.GLU.Raw
-    Graphics.Rendering.GLU.Raw.Callbacks
-    Graphics.Rendering.GLU.Raw.Functions
-    Graphics.Rendering.GLU.Raw.Tokens
-    Graphics.Rendering.GLU.Raw.Types
+    Graphics.GLU
+    Graphics.GLU.Callbacks
+    Graphics.GLU.Functions
+    Graphics.GLU.Tokens
+    Graphics.GLU.Types
   other-modules:
-    Graphics.Rendering.GLU.Raw.TypesInternal
+    Graphics.GLU.TypesInternal
   c-sources:
     cbits/HsGLURaw.c
   hs-source-dirs: src

diff --git a/src/Graphics/GLU.hs b/src/Graphics/GLU.hs
@@ -0,0 +1,25 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Graphics.GLU
+-- Copyright   :  (c) Sven Panne 2016
+-- License     :  BSD3
+--
+-- Maintainer  :  Sven Panne <[email protected]>
+-- Stability   :  stable
+-- Portability :  portable
+--
+-- A 1:1 binding for the OpenGL utility library.
+--
+--------------------------------------------------------------------------------
+
+module Graphics.GLU (
+   module Graphics.GLU.Functions,
+   module Graphics.GLU.Tokens,
+   module Graphics.GLU.Types,
+   module Graphics.GLU.Callbacks
+) where
+
+import Graphics.GLU.Functions
+import Graphics.GLU.Tokens
+import Graphics.GLU.Types
+import Graphics.GLU.Callbacks
diff --git a/src/Graphics/Rendering/GLU/Raw/Callbacks.hs → src/Graphics/GLU/Callbacks.hs b/src/Graphics/Rendering/GLU/Raw/Callbacks.hs → src/Graphics/GLU/Callbacks.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 --------------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.GLU.Raw.Callbacks
+-- Module      :  Graphics.GLU.Callbacks
 -- Copyright   :  (c) Sven Panne 2016
 -- License     :  BSD3
 --
@@ -13,7 +13,7 @@
 --
 --------------------------------------------------------------------------------
 
-module Graphics.Rendering.GLU.Raw.Callbacks (
+module Graphics.GLU.Callbacks (
    -- * Tessellator Callbacks
    -- ** Tessellator Callbacks without Polygon Data
    TessBeginCallback, makeTessBeginCallback,

diff --git a/src/Graphics/Rendering/GLU/Raw/Functions.hs → src/Graphics/GLU/Functions.hs b/src/Graphics/Rendering/GLU/Raw/Functions.hs → src/Graphics/GLU/Functions.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 --------------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.GLU.Raw.Functions
+-- Module      :  Graphics.GLU.Functions
 -- Copyright   :  (c) Sven Panne 2016
 -- License     :  BSD3
 --
@@ -13,7 +13,7 @@
 --
 --------------------------------------------------------------------------------
 
-module Graphics.Rendering.GLU.Raw.Functions (
+module Graphics.GLU.Functions (
    gluBeginCurve,
    gluBeginPolygon,
    gluBeginSurface,
@@ -84,7 +84,7 @@ import Foreign.Marshal.Error ( throwIf )
 import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr )
 import System.IO.Unsafe ( unsafePerformIO )
 
-import Graphics.Rendering.GLU.Raw.Types
+import Graphics.GLU.Types
 import Graphics.GL.Types
 
 --------------------------------------------------------------------------------

diff --git a/src/Graphics/Rendering/GLU/Raw/Tokens.hs → src/Graphics/GLU/Tokens.hs b/src/Graphics/Rendering/GLU/Raw/Tokens.hs → src/Graphics/GLU/Tokens.hs
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.GLU.Raw.Tokens
+-- Module      :  Graphics.GLU.Tokens
 -- Copyright   :  (c) Sven Panne 2016
 -- License     :  BSD3
 --
@@ -12,7 +12,7 @@
 --
 --------------------------------------------------------------------------------
 
-module Graphics.Rendering.GLU.Raw.Tokens where
+module Graphics.GLU.Tokens where
 
 import Graphics.GL.Core31
 

diff --git a/src/Graphics/Rendering/GLU/Raw/Types.hs → src/Graphics/GLU/Types.hs b/src/Graphics/Rendering/GLU/Raw/Types.hs → src/Graphics/GLU/Types.hs
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.GLU.Raw.Types
+-- Module      :  Graphics.GLU.Types
 -- Copyright   :  (c) Sven Panne 2016
 -- License     :  BSD3
 --
@@ -12,10 +12,10 @@
 --
 --------------------------------------------------------------------------------
 
-module Graphics.Rendering.GLU.Raw.Types (
+module Graphics.GLU.Types (
    GLUnurbs,
    GLUquadric,
    GLUtesselator
 ) where
 
-import Graphics.Rendering.GLU.Raw.TypesInternal
+import Graphics.GLU.TypesInternal
diff --git a/...aphics/Rendering/GLU/Raw/TypesInternal.hs → src/Graphics/GLU/TypesInternal.hs b/...aphics/Rendering/GLU/Raw/TypesInternal.hs → src/Graphics/GLU/TypesInternal.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_HADDOCK hide #-}
 --------------------------------------------------------------------------------
 -- |
--- Module      :  Graphics.Rendering.GLU.Raw.TypesInternal
+-- Module      :  Graphics.GLU.TypesInternal
 -- Copyright   :  (c) Sven Panne 2016
 -- License     :  BSD3
 --
@@ -13,7 +13,7 @@
 --
 --------------------------------------------------------------------------------
 
-module Graphics.Rendering.GLU.Raw.TypesInternal where
+module Graphics.GLU.TypesInternal where
 
 data GLUnurbs = GLUnurbs
 

diff --git a/src/Graphics/Rendering/GLU/Raw.hs b/src/Graphics/Rendering/GLU/Raw.hs
-Original file line number
+Diff line change
@@ -1,5 +1,7 @@
 .0.0.0
     -------
+    * Changed module name prefix from `Graphics.Rendering.GLU.Raw` to `Graphics.GLU`.
 .5.0.3
     -------
@@ Expand Down @@