diff --git a/src/render/gl-utils.lisp b/src/render/gl-utils.lisp index aa4f6d4..80ce0bb 100644 --- a/src/render/gl-utils.lisp +++ b/src/render/gl-utils.lisp @@ -11,8 +11,8 @@ :*minor-version* :*glsl-version* :gl-initialized-p - :initialize - :finalize + :gl-initialize + :gl-finalize :version-supported-p :gl-assert :gl-restart @@ -27,7 +27,7 @@ (defun gl-initialized-p () initializedp) - (defun initialize (version) + (defun gl-initialize (version) "Initialize the local opengl configuration. Store values like the drivers version." (if (/= version 0) @@ -40,7 +40,7 @@ Store values like the drivers version." (read in))) (setf initializedp t)) - (defun finalize () + (defun gl-finalize () (setf initializedp nil))) (defun version-supported-p (version) diff --git a/src/render/render.lisp b/src/render/render.lisp index d41365b..e5aaf7b 100644 --- a/src/render/render.lisp +++ b/src/render/render.lisp @@ -41,24 +41,24 @@ Create an opengl context attached to a window and initialize the shader system." (version (get-command-line-option-number argv "--opengl"))) (if version (progn - (gl-utils:initialize version) + (gl-initialize version) (setf *window* (glop:create-window title width height :major gl-utils:*major-version* :minor gl-utils:*minor-version*))) (progn (setf *window* (glop:create-window title width height)) - (gl-utils:initialize 0))) - (compile-all-shaders)) + (gl-initialize 0))) + (compiler:compile-all-shaders)) (initialize-renderer)) (defun finalize () "Finalize the render module. Destroy the opengl context and the related resources." (format t "Finalize Render module~%") - (destroy-all-shaders) + (compiler:destroy-all-shaders) (glop:destroy-window *window*) (setf *window* nil) - (gl-utils:finalize)) + (gl-finalize)) (defun update (delta-time) "Update the render module. diff --git a/src/stoe.lisp b/src/stoe.lisp index 93541f0..e0f30bb 100644 --- a/src/stoe.lisp +++ b/src/stoe.lisp @@ -60,7 +60,7 @@ continue unless `unprotected' is t." (global-set-motion #'freelook-move :x :y)) (defun game-start () - (let ((f (file:load-file #P"../data/cube.lisp" :sync t :type 'character))) + (let ((f (file:load-file #P"data/cube.lisp" :sync t :type 'character))) (attach (make-object :mesh (with-input-from-string (s f) (mesh:make-mesh (read s)))) (get-world-origin))))