Permalink
Browse files

Clean up as much as possible without any big changes.

  • Loading branch information...
Shinmera committed Jun 4, 2017
1 parent d7c6230 commit 2de89f846545932759b5f8015c06854d93e893c0
Showing with 7 additions and 1,308 deletions.
  1. +0 −1 asset-pool.lisp
  2. +0 −1 attributes.lisp
  3. +0 −15 camera.lisp
  4. +0 −1 collada.lisp
  5. +1 −31 controller.lisp
  6. +0 −7 deploy.lisp
  7. +0 −1 effects.lisp
  8. +0 −60 executable.lisp
  9. +0 −1 features.lisp
  10. +0 −1 flare.lisp
  11. +0 −1 geometry.lisp
  12. +0 −1 helpers.lisp
  13. +0 −55 hud.lisp
  14. +0 −1 input-tables.lisp
  15. +0 −1 layer-set.lisp
  16. +1 −1 main.lisp
  17. +0 −1 mapping.lisp
  18. +0 −250 octree.lisp
  19. +2 −1 octree2.lisp
  20. +1 −545 package.lisp
  21. +0 −1 physics.lisp
  22. +0 −1 pipeline.lisp
  23. +0 −99 player.lisp
  24. +0 −1 renderable.lisp
  25. +0 −1 retention.lisp
  26. +0 −1 savestate.lisp
  27. +0 −7 scene.lisp
  28. +0 −208 selectable.lisp
  29. +0 −1 shader-pass.lisp
  30. +0 −1 sprite.lisp
  31. +2 −3 transforms.lisp
  32. +0 −5 trial.asd
  33. +0 −1 vertex-format.lisp
  34. +0 −1 window.lisp
  35. +0 −1 workbench.lisp
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defmethod coerce-base (base)
(if *standalone*
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defvar *gl-attributes* #(:blend
:clip-distance0
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(define-subject camera (located-entity)
((near-plane :initarg :near-plane :accessor near-plane)
@@ -133,20 +132,6 @@
(define-handler (fps-camera mouse-move) (ev old-pos pos)
(do-fps-movement fps-camera old-pos pos))
(define-handler (fps-camera resume) (ev)
(q+:grab-mouse *context*)
(let ((cursor (q+:cursor *context*)))
(setf (q+:pos cursor) (q+:map-to-global *context* (q+:make-qpoint (round (/ (q+:width *context*) 2))
(round (/ (q+:height *context*) 2)))))
(setf (q+:shape cursor) (q+:qt.blank-cursor))
(setf (q+:cursor *context*) cursor)))
(define-handler (fps-camera pause) (ev)
(q+:release-mouse *context*)
(let ((cursor (q+:cursor *context*)))
(setf (q+:shape cursor) (q+:qt.arrow-cursor))
(setf (q+:cursor *context*) cursor)))
(define-subject freeroam-camera (fps-camera)
((move-speed :initarg :move-speed :accessor move-speed))
(:default-initargs
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
;;; Everything here is really primitive.
;; TODO: - Properly respect reading types
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(define-action system-action ())
@@ -24,29 +23,13 @@
(define-action reload-scene (system-action)
(key-press (eql key :f6)))
(define-subject controller (hud-entity persistent)
(define-subject controller (persistent)
(;; Has to be a double to avoid bignums after ~3.8 hours of runtime.
(tick-count :initform 0.0d0 :accessor tick-count)
(display :initform NIL :accessor display))
(:default-initargs
:name :controller))
#+:trial-debug-controller
(defmethod paint ((controller controller) (hud hud))
(with-pushed-attribs T
(with-painter (painter *context*)
(let ((font (get-resource 'font :trial :debug-hud))
(clock (clock (scene (display controller)))))
(setf (q+:render-hint painter) (q+:qpainter.text-antialiasing))
(setf (q+:render-hint painter) (q+:qpainter.high-quality-antialiasing))
(setf (q+:font painter) (data font))
(gl:color 255 255 255)
(q+:draw-text painter 20 30 (format NIL "Pause: ~,10f" (last-pause (display controller))))
(q+:draw-text painter 20 50 (format NIL "FPS: ~,2f" (actual-fps (display controller))))
(q+:draw-text painter 20 70 (format NIL "Time: ~2,'0d:~6,3,,,'0f"
(floor (/ (round clock) 60))
(mod clock 60)))))))
(define-handler (controller resize) (ev width height)
(let ((pipeline (pipeline (display controller))))
(when pipeline (resize pipeline width height))))
@@ -81,19 +64,6 @@
(define-handler (controller load-game) (ev)
(load-scene (event-loop controller) #p"~/test.sav.lisp"))
(define-handler (controller execute-request) (ev)
(execute ev))
(define-handler (controller launch-editor) (ev)
(let ((sys (asdf:find-system :trial-editor)))
(when sys
(unless (asdf:component-loaded-p sys)
(asdf:load-system sys))))
(when (find-package '#:org.shirakumo.fraf.trial.editor)
(with-body-in-gui ((display controller) :return-values NIL)
(funcall (find-symbol (string '#:launch) '#:org.shirakumo.fraf.trial.editor)
(display controller)))))
(define-handler (controller key-release) (ev key)
(when (eql key :escape)
(issue (event-loop controller) 'pause)))
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(define-user-libs (libstem-gamepad cl-gamepad-cffi::*static*)
(cl-gamepad-cffi:libstem-gamepad))
@@ -16,12 +15,6 @@
(define-user-libs (libfond cl-fond-cffi::*static*)
(cl-fond-cffi:libfond))
(define-user-libs (libsoloud cl-soloud-cffi::*static*)
(cl-soloud-cffi:libsoloud))
(define-user-libs (libmpg123 cl-mpg123-cffi::*static*)
(cl-mpg123-cffi:libmpg123))
(defun copy-dir-contents (dir to)
(let ((dir (pathname-utils:to-directory dir))
(to (pathname-utils:to-directory to)))
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(define-pool effects
:base 'trial)
View

This file was deleted.

Oops, something went wrong.
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(eval-when (:compile-toplevel :load-toplevel :execute)
(defvar *debug-features* '(:trial-debug-selection-buffer
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defmethod paint (thing target))
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(define-pool geometry
:base 'trial)
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defclass located-entity (entity)
((location :initarg :location :initform (vec 0 0 0) :accessor location)))
View

This file was deleted.

Oops, something went wrong.
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defparameter *key-table*
(alexandria:alist-hash-table
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defclass layer-container (container)
((layer :initarg :layer :accessor layer)
View
@@ -9,7 +9,7 @@
;; FIXME: Fullscreenable seems to cause really bad behaviour, idk
;; FIXME: Re-add hud somehow
(define-widget main (QGLWidget display input-handler executable window)
(define-widget main (QGLWidget display input-handler window)
((scene :initform (make-instance 'scene) :accessor scene)
(pipeline :initform (make-instance 'pipeline :name :pipeline) :accessor pipeline)
(controller :initform (make-instance 'controller))
View
@@ -5,7 +5,6 @@
|#
(in-package #:org.shirakumo.fraf.trial)
(in-readtable :qtools)
(defvar *mappings* (make-hash-table :test 'equal))
Oops, something went wrong.

0 comments on commit 2de89f8

Please sign in to comment.