Compare commits

...
Sign in to create a new pull request.

1 commit
dev ... master

Author SHA1 Message Date
5b85210ddf Fix compile errors 2015-08-25 11:55:25 +02:00
3 changed files with 10 additions and 10 deletions

View file

@ -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)

View file

@ -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.

View file

@ -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))))