Skip to content

Commit

Permalink
Update prompt stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shinmera
Shinmera committed Dec 10, 2018
1 parent 4e4e33a commit 8a2a946
Show file tree
Hide file tree
Showing 3 changed files with 171 additions and 73 deletions.
Binary file modified data/PromptFont.ttf
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion package.lisp
View file
Expand Up @@ -436,8 +436,9 @@
#:pipelined-scene)
;; prompt.lisp
(:export
#:prompt-font
#:prompt-char
#:prompt-charset
#:prompt-font
#:prompt)
;; rails.lisp
(:export
Expand Down
241 changes: 169 additions & 72 deletions prompt.lisp
View file
Expand Up @@ -6,80 +6,177 @@

(in-package #:org.shirakumo.fraf.trial)

(defparameter *prompt-char-table*
(macrolet ((-> (&rest entries)
`(let ((tab (make-hash-table :test 'eq)))
,@(loop for (k c) in entries
collect `(setf (gethash ',k tab) ,(string (code-char c))))
tab)))
(list :devices (-> (:GAMEPAD #x243C)
(:KEYBOARD #x243D)
(:MOUSE #x243E)
(:KEYBOARD-MOUSE #x243F))
:gamepad (-> (:DEVICE #x243C)
(:DPAD-L #x219E)
(:DPAD-U #x219F)
(:DPAD-R #x21A0)
(:DPAD-D #x21A1)
(:X #x21A4)
(:Y #x21A5)
(:B #x21A6)
(:A #x21A7)
(:L1 #x21B0)
(:R1 #x21B1)
(:L2 #x21B2)
(:R2 #x21B3)
(:L #x21BA)
(:R #x21BB)
(:L-L #x21BC)
(:R-L #x21BD)
(:L-U #x21BE)
(:R-U #x21BF)
(:L-R #x21C0)
(:R-R #x21C1)
(:L-D #x21C2)
(:R-D #x21C3)
(:A-L #x21C7)
(:A-U #x21C8)
(:A-R #x21C9)
(:A-D #x21CA)
(:A-UL #x21D6)
(:A-UR #x21D7)
(:A-DR #x21D8)
(:A-DL #x21D9)
(:SELECT #x21F7)
(:START #x21F8)
(:HOME #x21F9))
:keyboard (-> (:DEVICE #x243D)
(:| | #x0020)
(:! #x0021)
(:|"| #x0022)
(:|#| #x0023)
(:$ #x0024)
(:% #x0025)
(:& #x0026)
(:|'| #x0027)
(:|(| #x0028)
(:|)| #x0029)
(:* #x002A)
(:+ #x002B)
(:|,| #x002C)
(:- #x002D)
(:|.| #x002E)
(:/ #x002F)
(:|0| #x0030)
(:|1| #x0031)
(:|2| #x0032)
(:|3| #x0033)
(:|4| #x0034)
(:|5| #x0035)
(:|6| #x0036)
(:|7| #x0037)
(:|8| #x0038)
(:|9| #x0039)
(:|:| #x003A)
(:|;| #x003B)
(:< #x003C)
(:= #x003D)
(:> #x003E)
(:? #x003F)
(:@ #x0040)
(:A #x0041)
(:B #x0042)
(:C #x0043)
(:D #x0044)
(:E #x0045)
(:F #x0046)
(:G #x0047)
(:H #x0048)
(:I #x0049)
(:J #x004A)
(:K #x004B)
(:L #x004C)
(:M #x004D)
(:N #x004E)
(:O #x004F)
(:P #x0050)
(:Q #x0051)
(:R #x0052)
(:S #x0053)
(:T #x0054)
(:U #x0055)
(:V #x0056)
(:W #x0057)
(:X #x0058)
(:Y #x0059)
(:Z #x005A)
(:[ #x005B)
(:|\\| #x005C)
(:] #x005D)
(:^ #x005E)
(:_ #x005F)
(:|`| #x0060)
(:{ #x007B)
(:|\|| #x007C)
(:} #x007D)
(:~ #x007E)
(:LEFT #x2190)
(:UP #x2191)
(:RIGHT #x2192)
(:DOWN #x2193)
(:CTRL #x2427)
(:ALT #x2428)
(:SHIFT #x2429)
(:SUPER #x242A)
(:TAB #x242B)
(:CAPS #x242C)
(:BACKSPACE #x242D)
(:ENTER #x242E)
(:ESC #x242F)
(:PRTSC #x2430)
(:SCRLK #x2431)
(:PAUSE #x2432)
(:NUMLOCK #x2433)
(:INSERT #x2434)
(:HOME #x2435)
(:PAGEUP #x2436)
(:DELETE #x2437)
(:END #x2438)
(:PAGEDOWN #x2439)
(:F1 #x2460)
(:F2 #x2461)
(:F3 #x2462)
(:F4 #x2463)
(:F5 #x2464)
(:F6 #x2465)
(:F7 #x2466)
(:F8 #x2467)
(:F9 #x2468)
(:F10 #x2469)
(:F11 #x246A)
(:F12 #x246B))
:mouse (-> (:DEVICE #x243D)
(:LEFT #x27F5)
(:RIGHT #x27F6)
(:MIDDLE #x27F7)
(:SCROLL-U #x27F0)
(:SCROLL-D #x27F1)))))
(defun prompt-char (thing &key (bank :gamepad))
(let ((table (getf *prompt-char-table* bank)))
(when table (gethash thing table))))
(defun prompt-charset ()
(sort (with-output-to-string (out)
(loop for (bank table) on *prompt-char-table* by #'cddr
do (loop for string being the hash-values of table
do (write-string string out))))
#'char<))
(define-asset (trial prompt-font) font
#p"PromptFont.ttf"
:charset " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~↞↟↠↡↤↥↦↧↰↱↲↳↺↻↼↽↾↿⇀⇁⇂⇃⇇⇈⇉⇊⇖⇗⇘⇙⇷⇸⇹␧␨␩␪␫␬␭␮␯␰␱␲␳␴␵␶␷␸␹①②③④⑤⑥⑦⑧⑨⑩⑪⑫"
:size 32)

(defun prompt-char (thing)
(etypecase thing
(character thing)
(symbol
(ecase thing
(:dpad-l #\↞)
(:dpad-u #\↟)
(:dpad-r #\↠)
(:dpad-d #\↡)
(:x #\↤)
(:y #\↥)
(:b #\↦)
(:a #\↧)
(:l1 #\↰)
(:r1 #\↱)
(:l2 #\↲)
(:r2 #\↳)
(:l #\↺)
(:r #\↻)
(:l-l #\↼)
(:r-l #\↽)
(:l-u #\↾)
(:r-u #\↿)
(:l-r #\⇀)
(:r-r #\⇁)
(:l-d #\⇂)
(:r-d #\⇃)
(:a-l #\⇇)
(:a-u #\⇈)
(:a-r #\⇉)
(:a-d #\⇊)
(:a-ul #\⇖)
(:a-ur #\⇗)
(:a-dr #\⇘)
(:a-dl #\⇙)
(:select #\⇷)
(:start #\⇸)
(:home #\⇹)
(:ctrl #\␧)
(:alt #\␨)
(:shift #\␩)
(:super #\␪)
(:tab #\␫)
(:caps #\␬)
(:backspace #\␭)
(:enter #\␮)
(:esc #\␯)
(:prtsc #\␰)
(:scrlk #\␱)
(:pause #\␲)
(:numlock #\␳)
(:insert #\␴)
(:home #\␵)
(:pageup #\␶)
(:delete #\␷)
(:end #\␸)
(:pagedown #\␹)
(:f1 #\①)
(:f2 #\②)
(:f3 #\③)
(:f4 #\④)
(:f5 #\⑤)
(:f6 #\⑥)
(:f7 #\⑦)
(:f8 #\⑧)
(:f9 #\⑨)
(:f10 #\⑩)
(:f11 #\⑪)
(:f12 #\⑫)))))
:charset (prompt-charset)
:size 64)
(define-shader-subject prompt (text)
((texture :initform (asset 'trial 'prompt-font))))
Expand Down

0 comments on commit 8a2a946

Please sign in to comment.