Fixes and complete removal of all leftover Qt stuff.

asset.lisp

@@ -395,7 +395,7 @@
       object
     (cond (file
            (multiple-value-bind (bits rwidth rheight)
-               (cl-soil:load-image file :force-channels format)
+               (cl-soil:load-image file format)
              (list (or width rwidth) (or height rheight) bits format)))
           (T
            (list width (or height 1) (or bits (cffi:null-pointer)) format)))))
@@ -518,7 +518,8 @@
          (texspec (remf* spec :level :layer :attachment :bits)))
     (check-framebuffer-attachment attachment)
     (list* (apply #'make-instance 'texture-asset
-                  :input (list (width asset) (height asset)
+                  :input (list NIL
+                               (width asset) (height asset)
                                (getf spec :bits (cffi:null-pointer))
                                (case attachment
                                  (:depth-attachment :depth-component)

controller.lisp

@@ -8,9 +8,6 @@
 
 (define-action system-action ())
 
-(define-action launch-editor (system-action)
-  (key-press (eql key :section)))
-
 (define-action save-game (system-action)
   (key-press (eql key :f2)))
 

deploy.lisp

@@ -6,13 +6,13 @@
 
 (in-package #:org.shirakumo.fraf.trial)
 
-(define-user-libs (libstem-gamepad cl-gamepad-cffi::*static*)
+(qtools:define-user-libs (libstem-gamepad cl-gamepad-cffi::*static*)
   (cl-gamepad-cffi:libstem-gamepad))
 
-(define-user-libs (libmonitors cl-monitors-cffi::*static*)
+(qtools:define-user-libs (libmonitors cl-monitors-cffi::*static*)
   (cl-monitors-cffi:libmonitors))
 
-(define-user-libs (libfond cl-fond-cffi::*static*)
+(qtools:define-user-libs (libfond cl-fond-cffi::*static*)
   (cl-fond-cffi:libfond))
 
 (defun copy-dir-contents (dir to)

launcher/trial-launcher.asd

@@ -19,4 +19,5 @@
                :qtcore
                :qtgui
                :qtopengl
+               :qtools-ui-slider
                :trial))

package.lisp

@@ -7,8 +7,8 @@
 (in-package #:cl-user)
 (defpackage #:trial
   (:nicknames #:org.shirakumo.fraf.trial)
-  (:use #:cl+qt #:3d-vectors #:3d-matrices #:flare)
-  (:shadowing-import-from #:flare #:slot)
+  (:use #:cl #:3d-vectors #:3d-matrices #:flare)
+  (:import-from #:qtools #:finalize)
   (:shadow #:scene #:entity #:load)
   ;; context.lisp
   (:export
@@ -130,6 +130,5 @@
 
 (defpackage #:trial-user
   (:nicknames #:org.shirakumo.fraf.trial.user)
-  (:use #:cl+qt #:trial)
-  (:shadowing-import-from #:trial #:load)
-  (:shadowing-import-from #:flare #:slot))
+  (:use #:cl #:trial)
+  (:shadowing-import-from #:trial #:load))

subject.lisp

@@ -9,10 +9,22 @@
 (defclass subject-class-redefined (event)
   ((subject-class :initarg :subject-class :reader subject-class)))
 
-(defclass subject-class (qtools:finalizable-class handler-container)
+(defclass subject-class (standard-class handler-container)
   ((effective-handlers :initform NIL :accessor effective-handlers)
    (instances :initform () :accessor instances)))
 
+(defmethod c2mop:validate-superclass ((class subject-class) (superclass t))
+  NIL)
+
+(defmethod c2mop:validate-superclass ((class standard-class) (superclass subject-class))
+  NIL)
+
+(defmethod c2mop:validate-superclass ((class subject-class) (superclass standard-class))
+  T)
+
+(defmethod c2mop:validate-superclass ((class subject-class) (superclass subject-class))
+  T)
+
 (defmethod cascade-option-changes ((class subject-class))
   ;; Recompute effective handlers
   (loop with effective-handlers = (handlers class)
@@ -60,7 +72,7 @@
 (defmethod remove-handler (handler (class symbol))
   (remove-handler handler (find-class class)))
 
-(defclass subject (entity finalizable handler-container)
+(defclass subject (entity handler-container)
   ((event-loop :initarg :event-loop :accessor event-loop))
   (:default-initargs
    :event-loop NIL)