| Revision | 592642a7a3b1cdcf53b2a4ab6a80e6f1d3364b24 (tree) |
|---|---|
| Time | 2022-05-02 20:26:36 |
| Author | Giulio De Stasio <giuliods@user...> |
| Commiter | Giulio De Stasio |
inverted rendering positions
.hgignore (diff) core.lisp (diff) graphics/grid.lisp (diff) graphics/inputs.lisp (diff) graphics/view.lisp (diff) raylib/package.lisp (diff) system.asd (diff)| @@ -9,3 +9,4 @@ | ||
| 9 | 9 | *.rpm |
| 10 | 10 | *~undo-tree~ |
| 11 | 11 | kick.lisp |
| 12 | +TAGS |
| @@ -7,10 +7,12 @@ | ||
| 7 | 7 | (defparameter *screen-width* 1024) |
| 8 | 8 | (defparameter *screen-height* 768) |
| 9 | 9 | |
| 10 | +;; apply to load and save | |
| 11 | + | |
| 10 | 12 | (defun main () |
| 11 | 13 | ;(bt:make-thread (lambda () (lobby:editor-gui))) ;; here bt-thread it is just used for execute ltk without troubles |
| 12 | 14 | ;; for now it is disabled |
| 13 | - (graphics:add-entity (make-instance 'layers:entity :icon "test.png" :size 2.0)) | |
| 15 | + (graphics:add-entity (make-instance 'layers:entity :icon "test.png" :size 1.0)) | |
| 14 | 16 | |
| 15 | 17 | (bt:make-thread (lambda () (graphics:playground *screen-width* *screen-height* "Ru*** Lisp Playground"))) |
| 16 | 18 | ) |
| @@ -2,6 +2,12 @@ | ||
| 2 | 2 | |
| 3 | 3 | (defparameter +grid-span+ 70) |
| 4 | 4 | |
| 5 | +; these two functions can be edited when different grids will be added | |
| 6 | +(defun position-actor-to-view (a) | |
| 7 | + (* a +grid-span+)) | |
| 8 | +(defun position-view-to-actor (a) | |
| 9 | + (/ a +grid-span+)) | |
| 10 | + | |
| 5 | 11 | (defparameter +letters-list+ |
| 6 | 12 | '("A" "B" "C" "D" "E" "F" "G" "H" "I" "J" "K" "L" "M" |
| 7 | 13 | "N" "O" "P" "Q" "R" "S" "T" "U" "V" "W" "X" "Y" "Z")) |
| @@ -10,6 +16,16 @@ | ||
| 10 | 16 | (defun letter-cycle (n) |
| 11 | 17 | (nth (mod n (length +letters-list+)) +letters-list+)) |
| 12 | 18 | |
| 19 | +(defun toggle-grid () | |
| 20 | + (if +is-grid+ | |
| 21 | + (setf +is-grid+ nil) | |
| 22 | + (setf +is-grid+ t))) | |
| 23 | + | |
| 24 | +(defun toggle-grid-letters () | |
| 25 | + (if +is-grid-letters+ | |
| 26 | + (setf +is-grid-letters+ nil) | |
| 27 | + (setf +is-grid-letters+ t))) | |
| 28 | + | |
| 13 | 29 | (defun make-grid (screen-width screen-height) |
| 14 | 30 | (let ((x-iterations (/ screen-width +grid-span+)) |
| 15 | 31 | (y-iterations (/ screen-height +grid-span+))) |
| @@ -33,8 +49,8 @@ | ||
| 33 | 49 | (loop :for i :from 0 :to x-iterations |
| 34 | 50 | :do (loop :for j :from 0 :to y-iterations |
| 35 | 51 | :do (raylib:draw-text (format nil "~d~d" (letter-cycle i) j) |
| 36 | - (+ (* i +grid-span+) 2) | |
| 37 | - (+ (* j +grid-span+) 2) | |
| 52 | + (+ (position-actor-to-view i) 2) | |
| 53 | + (+ (position-actor-to-view j) 2) | |
| 38 | 54 | 30 |
| 39 | 55 | raylib:+lightgray+))) |
| 40 | 56 | )) |
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | (in-package :graphics) |
| 2 | 2 | |
| 3 | 3 | (defparameter +pointer+ nil) ; this parameter check out which entity is selected |
| 4 | +(defparameter +mode+ '+normal-mode+) | |
| 4 | 5 | |
| 5 | 6 | (defun select-pointer (mouse-x mouse-y) |
| 6 | 7 | (let* ((obj-list (map 'list #'(lambda (o) (car o)) +entities-list+)) |
| @@ -33,12 +34,10 @@ | ||
| 33 | 34 | '(raylib:+mouse-right-button+ (move-entity |
| 34 | 35 | (raylib:vector2-x mouse-position) |
| 35 | 36 | (raylib:vector2-y mouse-position))) |
| 36 | - '(raylib:+mouse-middle-button+ (toggle-grid-letters)))) | |
| 37 | + '(raylib:+mouse-middle-button+ (setf +mode+ '+menu-mode+)))) | |
| 37 | 38 | |
| 38 | 39 | (defparameter +menu-mode+ (list |
| 39 | - '(raylib:+mouse-left-button+ (format t "L")) | |
| 40 | - '(raylib:+mouse-right-button+ (format t "R")) | |
| 41 | - '(raylib:+mouse-middle-button+ (format t "M")))) | |
| 40 | + '(raylib:+mouse-left-button+ (select-menu mouse-position)))) | |
| 42 | 41 | |
| 43 | 42 | ;; This simple function check if the given stroke is pressed, then return's it if it is |
| 44 | 43 | (defun use-mouse (stroke) |
| @@ -7,53 +7,47 @@ | ||
| 7 | 7 | ;; grid variable to toggle in the repl |
| 8 | 8 | (defparameter +is-grid+ t) |
| 9 | 9 | (defparameter +is-grid-letters+ t) |
| 10 | - | |
| 11 | -(defun toggle-grid () | |
| 12 | - (if +is-grid+ | |
| 13 | - (setf +is-grid+ nil) | |
| 14 | - (setf +is-grid+ t))) | |
| 15 | - | |
| 16 | -(defun toggle-grid-letters () | |
| 17 | - (if +is-grid-letters+ | |
| 18 | - (setf +is-grid-letters+ nil) | |
| 19 | - (setf +is-grid-letters+ t))) | |
| 10 | +(defparameter +camera-movement+ '(0 0)) | |
| 20 | 11 | |
| 21 | 12 | ;; this is the de-facto main, it initialize and display the graphic items |
| 22 | 13 | (defun playground (width height title &optional (fps 60) (debug-info nil)) |
| 23 | 14 | (defvar mouse-position nil) |
| 24 | - (defvar mode +normal-mode+) | |
| 15 | +; (defvar mode +normal-mode+) | |
| 25 | 16 | (defvar camera (make-camera2d |
| 26 | 17 | :offset (make-vector2 :x 0 :y 0) |
| 27 | 18 | :target (make-vector2 :x 0 :y 0) |
| 28 | 19 | :rotation 1.0 |
| 29 | 20 | :zoom 1.0)) |
| 30 | 21 | (raylib:with-window (width height title) |
| 31 | - (raylib:set-target-fps fps) | |
| 32 | - (raylib:with-mode-2d (camera) | |
| 22 | + (raylib:set-target-fps fps) | |
| 23 | + (raylib:with-mode-2d (camera) | |
| 33 | 24 | (loop :while (not (raylib:window-should-close)) |
| 34 | 25 | :do |
| 35 | - (setf mouse-position (raylib:get-mouse-position)) | |
| 36 | - (loop :for stk :in mode | |
| 37 | - :do (use-mouse stk)) | |
| 38 | - (raylib:with-drawing | |
| 39 | - (raylib:clear-background raylib:+black+) | |
| 40 | - ;; render grid and grid's letters | |
| 41 | - (when +is-grid+ (make-grid width height)) | |
| 42 | - (when +is-grid-letters+ (make-grid-letters width height)) | |
| 43 | - ;; render entities and planes | |
| 44 | - (render-planes) | |
| 45 | - (render-entities) | |
| 46 | - ;; display the pointer, this is actually contained in inputs.lisp | |
| 47 | - (when (numberp +pointer+) | |
| 48 | - (let* ((selected-entity (car (nth +pointer+ +entities-list+))) | |
| 49 | - (i-x (* (layers:entity-x selected-entity) +grid-span+)) | |
| 50 | - (i-y (* (layers:entity-y selected-entity) +grid-span+))) | |
| 51 | - (raylib:draw-rectangle-lines i-x | |
| 52 | - i-y | |
| 53 | - (floor (* (layers:entity-size selected-entity) +grid-span+)) | |
| 54 | - (floor (* (layers:entity-size selected-entity) +grid-span+)) | |
| 55 | - raylib:+red+))) | |
| 56 | - ;; display debug informations if there's any | |
| 57 | - (when debug-info | |
| 58 | - (raylib:draw-text (format nil "D]: ~d" debug-info) 0 0 10 raylib:+lightgray+)) | |
| 59 | - ))))) | |
| 26 | + (setf mouse-position (raylib:get-mouse-position)) | |
| 27 | + (loop :for stk :in (eval +mode+) | |
| 28 | + :do (use-mouse stk)) | |
| 29 | + (raylib:with-drawing | |
| 30 | + (raylib:clear-background raylib:+black+) | |
| 31 | + ;; render planes | |
| 32 | + (render-planes) | |
| 33 | + ;; render grid and grid's letters | |
| 34 | + (when +is-grid+ (make-grid width height)) | |
| 35 | + (when +is-grid-letters+ (make-grid-letters width height)) | |
| 36 | + ;; render entities | |
| 37 | + (render-entities) | |
| 38 | + ;; display the pointer, this is actually contained in inputs.lisp | |
| 39 | + (when (numberp +pointer+) | |
| 40 | + (let* ((selected-entity (car (nth +pointer+ +entities-list+))) | |
| 41 | + (i-x (* (layers:entity-x selected-entity) +grid-span+)) | |
| 42 | + (i-y (* (layers:entity-y selected-entity) +grid-span+))) | |
| 43 | + (raylib:draw-rectangle-lines i-x | |
| 44 | + i-y | |
| 45 | + (floor (* (layers:entity-size selected-entity) +grid-span+)) | |
| 46 | + (floor (* (layers:entity-size selected-entity) +grid-span+)) | |
| 47 | + raylib:+red+))) | |
| 48 | + (when (eq +mode+ '+menu-mode+) | |
| 49 | + (display-menu mouse-position)) | |
| 50 | + ;; display debug informations if there's any | |
| 51 | + (when debug-info | |
| 52 | + (raylib:draw-text (format nil "D]: ~d" debug-info) 0 0 10 raylib:+lightgray+)) | |
| 53 | + ))))) |
| @@ -361,6 +361,7 @@ | ||
| 361 | 361 | #:draw-ring-lines |
| 362 | 362 | #:draw-rectangle |
| 363 | 363 | #:draw-rectangle-rec |
| 364 | + #:draw-rectangle-v | |
| 364 | 365 | #:draw-rectangle-pro |
| 365 | 366 | #:draw-rectangle-gradient-v |
| 366 | 367 | #:draw-rectangle-gradient-h |
| @@ -28,8 +28,8 @@ | ||
| 28 | 28 | :depends-on ("raylib") |
| 29 | 29 | :components ((:file "package") |
| 30 | 30 | (:file "inputs" :depends-on ("package")) |
| 31 | -; (:file "menu" :depends-on ("package")) | |
| 31 | + (:file "menu" :depends-on ("package")) | |
| 32 | 32 | (:file "render" :depends-on ("package")) |
| 33 | 33 | (:file "grid" :depends-on ("package")) |
| 34 | - (:file "view" :depends-on ("package" "grid" "render" "inputs")))) | |
| 34 | + (:file "view" :depends-on ("package" "grid" "render" "inputs" "menu")))) | |
| 35 | 35 | (:file "core" :depends-on ("layers" "lobby" "graphics")))) |
Fork