Move the shader folder to the root folder

engine/all.lisp

@@ -11,5 +11,4 @@
    #+stoe-foreign-assets
    :stoe/engine/import
    :stoe/engine/render
-   :stoe/engine/shaders
-   :stoe/engine/shader/all))
+   :stoe/engine/shaders))

engine/shader/all.lisp

@@ -1,12 +0,0 @@
-#|
-  This file is a part of stoe project.
-  Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
-|#
-
-(uiop:define-package :stoe/engine/shader/all
-    (:nicknames :shader)
-  (:use-reexport
-   :stoe/engine/shader/shader
-   :stoe/engine/shader/walker
-   :stoe/engine/shader/glsl
-   :stoe/engine/shader/compiler))

engine/shaders.lisp

@@ -5,7 +5,7 @@
 
 (uiop:define-package :stoe/engine/shaders
   (:nicknames :shaders)
-  (:use :stoe/engine/shader/compiler))
+  (:use :stoe/shader/compiler))
 (in-package :stoe/engine/shaders)
 
 (defshader simple-vertex ((position :vec4 :in)

shader/all.lisp

@@ -0,0 +1,12 @@
+#|
+  This file is a part of stoe project.
+  Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
+|#
+
+(uiop:define-package :stoe/shader/all
+    (:nicknames :shader)
+  (:use-reexport
+   :stoe/shader/shader
+   :stoe/shader/walker
+   :stoe/shader/glsl
+   :stoe/shader/compiler))

shader/compiler.lisp

@@ -3,17 +3,17 @@
   Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
 |#
 
-(uiop:define-package :stoe/engine/shader/compiler
+(uiop:define-package :stoe/shader/compiler
     (:use :cl
           :stoe/core/utils
           :stoe/engine/gl-utils
-          :stoe/engine/shader/shader
-          :stoe/engine/shader/glsl)
+          :stoe/shader/shader
+          :stoe/shader/glsl)
   (:export #:defshader
            #:defprogram
            #:compile-all-shaders
            #:destroy-all-shaders))
-(in-package :stoe/engine/shader/compiler)
+(in-package :stoe/shader/compiler)
 
 (defvar *shaders-table* (make-hash-table))
 (defvar *programs-table* (make-hash-table))

shader/glsl.lisp

@@ -3,10 +3,10 @@
   Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
 |#
 
-(uiop:define-package :stoe/engine/shader/glsl
-  (:use :cl :stoe/core/utils :stoe/engine/shader/walker :stoe/engine/shader/shader)
+(uiop:define-package :stoe/shader/glsl
+  (:use :cl :stoe/core/utils :stoe/shader/walker :stoe/shader/shader)
   (:export #:glsl-compile #:glsl-print))
-(in-package :stoe/engine/shader/glsl)
+(in-package :stoe/shader/glsl)
 
 (defvar *form-handlers* (make-hash-table)
   "Hash table for the form handlers for a glsl dsl.")

shader/shader.lisp

@@ -3,7 +3,7 @@
   Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
 |#
 
-(uiop:define-package :stoe/engine/shader/shader
+(uiop:define-package :stoe/shader/shader
   (:use :cl :stoe/core/utils :stoe/engine/gl-utils)
   (:export #:make-shader
            #:make-var
@@ -24,7 +24,7 @@
            #:get-location
            #:using-program
            #:with-locations))
-(in-package :stoe/engine/shader/shader)
+(in-package :stoe/shader/shader)
 
 (defstruct shader
   "Structure containing the shader in glsl format together with metadata used to

shader/walker.lisp

@@ -3,13 +3,13 @@
   Copyright (c) 2015 Renaud Casenave-Péré (renaud@casenave-pere.fr)
 |#
 
-(uiop:define-package :stoe/engine/shader/walker
+(uiop:define-package :stoe/shader/walker
   (:use :cl :stoe/core/utils)
   (:export #:walk-1
            #:walk-list
            #:walk
            #:defhandler))
-(in-package :stoe/engine/shader/walker)
+(in-package :stoe/shader/walker)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *form-handlers* (make-hash-table)

stoe.asd

@@ -47,7 +47,7 @@
                "stoe/maths/all"
                "stoe/core/all"
                "stoe/engine/all"
-               "stoe/engine/shader/all"
+               "stoe/shader/all"
                "stoe/game/all")
   :in-order-to ((test-op (load-op stoe/test))))
 
@@ -57,7 +57,7 @@
 (register-system-packages "stoe/maths/all" '(:maths))
 (register-system-packages "stoe/core/all" '(:core))
 (register-system-packages "stoe/engine/all" '(:engine))
-(register-system-packages "stoe/engine/shader/all" '(:shader))
+(register-system-packages "stoe/shader/all" '(:shader))
 (register-system-packages "stoe/game/all" '(:game))
 (register-system-packages "stoe/test/all" '(:stoe/test))