Skip to content

Commit

Permalink
Fix dependencies a lil
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinmera committed Sep 12, 2023
1 parent 830138a commit 9ded43e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 4 additions & 0 deletions helpers.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
(in-package #:org.shirakumo.fraf.trial)

(defclass transformed () ())
(defclass renderable () ())
(defclass dynamic-renderable (renderable) ())

(defclass located-entity (transformed entity)
((location :initarg :location :initform (vec 0 0 0) :reader location :reader 3ds:location)))

Expand Down
2 changes: 1 addition & 1 deletion resources/buffer-object.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
count data (memory-region-size region)))
(download-buffer-data/ptr buffer (memory-region-pointer region) (or count (memory-region-size region)) buffer-start)))

(defmethod resize-buffer ((buffer vertex-buffer) (size (eql T)) &key (data (buffer-data buffer)) (data-start 0))
(defmethod resize-buffer ((buffer buffer-object) (size (eql T)) &key (data (buffer-data buffer)) (data-start 0))
(mem:with-memory-region (region data :offset data-start)
(resize-buffer/ptr buffer (memory-region-size region) (memory-region-pointer region))))

Expand Down
4 changes: 0 additions & 4 deletions shader-pass.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@
(texture-port
(setf (unit-id port) (decf texture-index))))))

(defclass transformed () ())
(defclass renderable () ())
(defclass dynamic-renderable (renderable) ())

(defgeneric apply-transforms (object)
(:method-combination progn :most-specific-last))
(defgeneric bind-textures (object))
Expand Down
6 changes: 3 additions & 3 deletions trial.asd
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
(:file "asset-pool" :depends-on ("package" "asset"))
(:file "async" :depends-on ("package" "main"))
(:file "bag" :depends-on ("package" "container"))
(:file "camera" :depends-on ("package" "container" "input" "transforms"))
(:file "camera" :depends-on ("package" "container" "input" "transforms" "helpers"))
(:file "capture" :depends-on ("package" "toolkit" "serialize" "event-loop" "input"))
(:file "conditions" :depends-on ("package"))
(:file "container" :depends-on ("package" "toolkit" "transforms"))
Expand All @@ -46,7 +46,7 @@
(:file "gl-features" :depends-on ("package"))
(:file "gl-struct" :depends-on ("package" "type-info"))
(:file "hash-table-container" :depends-on ("package" "container"))
(:file "helpers" :depends-on ("package" "container" "transforms" "shader-entity" "shader-pass" "asset" "resources" "loader" "geometry"))
(:file "helpers" :depends-on ("package" "container" "transforms" "shader-entity" "asset" "asset-pool" "resources" "loader" "geometry" "geometry-shapes"))
(:file "input" :depends-on ("package" "event-loop"))
(:file "interpolation" :depends-on ("package"))
(:file "language" :depends-on ("package" "toolkit" "settings"))
Expand All @@ -71,7 +71,7 @@
(:file "serialize" :depends-on ("package"))
(:file "settings" :depends-on ("package" "toolkit"))
(:file "shader-entity" :depends-on ("package" "container" "event-loop" "loader"))
(:file "shader-pass" :depends-on ("package" "shader-entity" "resource" ("resources" "framebuffer") ("resources" "shader-program") "scene" "loader" "context" "geometry-shapes" "camera"))
(:file "shader-pass" :depends-on ("package" "shader-entity" "helpers" "resource" ("resources" "framebuffer") ("resources" "shader-program") "scene" "loader" "context" "geometry-shapes" "camera"))
(:file "skybox" :depends-on ("package" "shader-entity" "transforms"))
(:file "sprite" :depends-on ("package" "shader-entity" "helpers" ("assets" "sprite-data")))
(:file "static-vector" :depends-on ("package"))
Expand Down

0 comments on commit 9ded43e

Please sign in to comment.