Minor

renderer/pbr.lisp

@@ -28,6 +28,13 @@
   (aref (textures material) 3))
 
 (defmethod shared-initialize :after ((material pbr-material) slots &key metalness-texture roughness-texture occlusion-texture metal-rough-texture)
+  ;; Reshuffle arguments when the textures are badly specified.
+  (when (and metalness-texture (eq metalness-texture roughness-texture))
+    (setf metal-rough-texture metalness-texture)
+    (setf metalness-texture NIL roughness-texture NIL))
+  (when (and metal-rough-texture (eq metal-rough-texture occlusion-texture))
+    (setf (aref (textures material) 1) metal-rough-texture)
+    (setf metal-rough-texture NIL occlusion-texture NIL))
   (cond ((and metalness-texture roughness-texture occlusion-texture)
          (loop for source in (sources metalness-texture)
                do (setf (target source) :r))

texture-source.lisp

@@ -19,6 +19,19 @@
   (src (list NIL NIL NIL NIL NIL NIL))
   (dst (list NIL NIL NIL NIL NIL NIL)))
 
+(defmethod print-object ((source texture-source) stream)
+  (print-unreadable-object (source stream :type T)
+    (format stream "~a ~a"
+            (pixel-type source) (pixel-format source))
+    (destructuring-bind (x y z w h d) (texture-source-src source)
+      (when (or x y z w h d)
+        (format stream " SRC: ~@[~a~]~@[,~a~]~@[,~a~]~@[:~a~]~@[x~a~]~@[x~a~]"
+                x y z w h d)))
+    (destructuring-bind (x y z w h d) (texture-source-dst source)
+      (format stream " DST: ~@[~a~]~@[,~a~]~@[,~a~]~@[:~a~]~@[x~a~]~@[x~a~]"
+              x y z w h d)
+      (format stream "~@[ ~a~]~@[ (~a)~]" (target source) (level source)))))
+
 (define-accessor-delegate-methods pixel-data (texture-source-pixel-data texture-source))
 (define-accessor-delegate-methods pixel-type (texture-source-pixel-type texture-source))
 (define-accessor-delegate-methods pixel-format (texture-source-pixel-format texture-source))