Rename interactions system to its intended name

borodust · Dec 27, 2016 · 1cba146 · 1cba146
1 parent 5424f57
commit 1cba146
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 64 deletions.
diff --git a/cl-bodge.asd b/cl-bodge.asd
@@ -249,6 +249,24 @@
                         ((:file "text")))))
 
 
+(defsystem cl-bodge/poiu
+  :description "Bodacious Game Engine Plain Old Interface for Users"
+  :version "0.3.0"
+  :author "Pavel Korolev"
+  :mailto "dev@borodust.org"
+  :license "MIT"
+  :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/graphics bodge-nuklear cl-bodge/text
+                               cl-bodge/canvas cl-autowrap cl-plus-c cl-bodge/assets)
+  :pathname "poiu"
+  :serial t
+  :components ((:file "packages")
+               (:file "poiu")
+               (:file "text-renderer")
+               (:file "rendering-backend")
+               (:module shaders
+                        :components ((:file "text")))))
+
+
 (defsystem cl-bodge/scenegraph
   :description "Bodacious Game Engine scenegraph implementation"
   :version "0.3.0"
@@ -271,27 +289,6 @@
                (:file "model")))
 
 
-(defsystem cl-bodge/interactions
-  :description "Bodacious Game Engine user interfaces"
-  :version "0.3.0"
-  :author "Pavel Korolev"
-  :mailto "dev@borodust.org"
-  :license "MIT"
-  :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/graphics bodge-nuklear cl-bodge/text
-                               cl-bodge/canvas cl-autowrap cl-plus-c cl-bodge/assets
-                               cl-bodge/host)
-  :pathname "ui"
-  :serial t
-  :components ((:file "packages")
-               (:file "ui")
-               (:file "text-renderer")
-               (:file "rendering-backend")
-               (:file "poiu")
-               (:module shaders
-                        :components ((:file "text")))
-               (:file "system")))
-
-
 (defsystem cl-bodge/distribution
   :description "Bodacious Game Engine distribution helpers"
   :version "0.3.0"
@@ -339,5 +336,5 @@
   :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/events cl-bodge/host
                                cl-bodge/graphics cl-bodge/audio cl-bodge/physics
                                cl-bodge/resources cl-bodge/assets cl-bodge/scenegraph
-                               cl-bodge/interactions cl-bodge/text cl-bodge/canvas)
+                               cl-bodge/poiu cl-bodge/text cl-bodge/canvas)
   :components ((:file "packages")))
diff --git a/packages.lisp b/packages.lisp
@@ -15,6 +15,6 @@
                  :cl-bodge.physics
                  :cl-bodge.resources
                  :cl-bodge.scene
-                 :cl-bodge.interactions
+                 :cl-bodge.poiu
                  :cl-bodge.text
                  :cl-bodge.canvas))
diff --git a/poiu/packages.lisp b/poiu/packages.lisp
@@ -0,0 +1,10 @@
+(in-package :cl-bodge.asdf)
+
+
+(defpackage :cl-bodge.poiu
+  (:nicknames :ge.poiu)
+  (:use :cl :cl-bodge.engine :cl-bodge.utils :cl-bodge.graphics :plus-c
+        :cl-bodge.canvas :autowrap :cl-bodge.text :cl-bodge.assets)
+  (:export make-poiu-context
+           with-poiu
+           in-window))
diff --git a/ui/ui.lisp → poiu/poiu.lisp b/ui/ui.lisp → poiu/poiu.lisp
@@ -1,4 +1,4 @@
-(in-package :cl-bodge.interactions)
+(in-package :cl-bodge.poiu)
 
 
 (declaim (special *context*

diff --git a/ui/rendering-backend.lisp → poiu/rendering-backend.lisp b/ui/rendering-backend.lisp → poiu/rendering-backend.lisp
@@ -1,4 +1,4 @@
-(in-package :cl-bodge.interactions)
+(in-package :cl-bodge.poiu)
 
 
 (defmacro dissect-c-struct ((&rest bindings) (wrapper type) &body body)

diff --git a/ui/shaders/f_text.glsl → poiu/shaders/f_text.glsl b/ui/shaders/f_text.glsl → poiu/shaders/f_text.glsl
diff --git a/ui/shaders/g_text.glsl → poiu/shaders/g_text.glsl b/ui/shaders/g_text.glsl → poiu/shaders/g_text.glsl
diff --git a/ui/shaders/text.lisp → poiu/shaders/text.lisp b/ui/shaders/text.lisp → poiu/shaders/text.lisp
@@ -1,4 +1,4 @@
-(in-package :cl-bodge.interactions)
+(in-package :cl-bodge.poiu)
 
 
 (define-shading-program text-shading

diff --git a/ui/shaders/v_text.glsl → poiu/shaders/v_text.glsl b/ui/shaders/v_text.glsl → poiu/shaders/v_text.glsl
diff --git a/ui/text-renderer.lisp → poiu/text-renderer.lisp b/ui/text-renderer.lisp → poiu/text-renderer.lisp
@@ -1,4 +1,4 @@
-(in-package :cl-bodge.interactions)
+(in-package :cl-bodge.poiu)
 
 
 (defstruct (text-cache

diff --git a/ui/packages.lisp b/ui/packages.lisp
diff --git a/ui/poiu.lisp b/ui/poiu.lisp
diff --git a/ui/system.lisp b/ui/system.lisp