From 1eee4d0f34fec0a5000776f80df0096446a76b7a Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 28 Oct 2019 19:29:40 -0500 Subject: [PATCH] extra: whitespace --- extra/modern/manifest/manifest.factor | 2 +- extra/random/xoshiro/xoshiro.factor | 2 +- extra/raylib/demo/demo.factor | 2 +- extra/raylib/ffi/ffi.factor | 178 +++++++++++----------- extra/raylib/gui-demo/gui-demo.factor | 2 +- extra/raylib/modules/gui/gui.factor | 2 +- extra/raylib/modules/ricons/ricons.factor | 3 +- extra/zealot/help-lint/help-lint.factor | 2 +- 8 files changed, 95 insertions(+), 98 deletions(-) diff --git a/extra/modern/manifest/manifest.factor b/extra/modern/manifest/manifest.factor index 44cb086a87..428647b10b 100644 --- a/extra/modern/manifest/manifest.factor +++ b/extra/modern/manifest/manifest.factor @@ -329,4 +329,4 @@ git branch name: no backslash, ., .., ~^:, end in / ;VOCAB> ;ROOT> ;REPO> -]] \ No newline at end of file +]] diff --git a/extra/random/xoshiro/xoshiro.factor b/extra/random/xoshiro/xoshiro.factor index acfff6c26f..ff6bde5a4a 100644 --- a/extra/random/xoshiro/xoshiro.factor +++ b/extra/random/xoshiro/xoshiro.factor @@ -46,7 +46,7 @@ STRUCT: xoshiro-256-star-star { s0 ulonglong } { s1 ulonglong } { s2 ulonglong } : next-256 ( xoshiro-256-star-star -- r64 ) dup get[ s0 s1 s2 s3 ] (next-256) - [ set[ s0 s1 s2 s3 ] drop ] dip ; + [ set[ s0 s1 s2 s3 ] drop ] dip ; :: jump ( s0! s1! s2! s3! jump-table -- s0' s1' s2' s3' ) 0 0 0 0 :> ( t0! t1! t2! t3! ) diff --git a/extra/raylib/demo/demo.factor b/extra/raylib/demo/demo.factor index 56c5ba1765..7bd8524e07 100644 --- a/extra/raylib/demo/demo.factor +++ b/extra/raylib/demo/demo.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2019 Jack Lucas ! See http://factorcode.org/license.txt for BSD license. USING: raylib.ffi kernel math.ranges sequences locals random combinators.random math threads calendar namespaces accessors classes.struct combinators alien.enums ; -IN: raylib.demo +IN: raylib.demo : say-hello ( -- ) "Hello, Factor!" 200 400 60 MAGENTA draw-text ; diff --git a/extra/raylib/ffi/ffi.factor b/extra/raylib/ffi/ffi.factor index 5e0bfd865d..beeb74cacc 100644 --- a/extra/raylib/ffi/ffi.factor +++ b/extra/raylib/ffi/ffi.factor @@ -12,7 +12,7 @@ IN: raylib.ffi { [ os windows? ] [ "raylib.dll" ] } { [ os macosx? ] [ "libraylib.dylib" ] } { [ os unix? ] [ "libraylib.so" ] } -} cond cdecl add-library +} cond cdecl add-library "raylib" deploy-library >> @@ -241,84 +241,84 @@ ENUM: raylibConfigFlags { FLAG_VSYNC_HINT 64 } ; ! Set to try enabling V-Sync on GPU ENUM: KeyboardFunctionKeys - { KEY_SPACE 32 } - { KEY_ESCAPE 256 } - { KEY_ENTER 257 } - { KEY_TAB 258 } - { KEY_BACKSPACE 259 } - { KEY_INSERT 260 } - { KEY_DELETE 261 } - { KEY_RIGHT 262 } - { KEY_LEFT 263 } - { KEY_DOWN 264 } - { KEY_UP 265 } - { KEY_PAGE_UP 266 } - { KEY_PAGE_DOWN 267 } - { KEY_HOME 268 } - { KEY_END 269 } - { KEY_CAPS_LOCK 280 } - { KEY_SCROLL_LOCK 281 } - { KEY_NUM_LOCK 282 } - { KEY_PRINT_SCREEN 283 } - { KEY_PAUSE 284 } - { KEY_F1 290 } - { KEY_F2 291 } - { KEY_F3 292 } - { KEY_F4 293 } - { KEY_F5 294 } - { KEY_F6 295 } - { KEY_F7 296 } - { KEY_F8 297 } - { KEY_F9 298 } - { KEY_F10 299 } - { KEY_F11 300 } - { KEY_F12 301 } - { KEY_LEFT_SHIFT 340 } - { KEY_LEFT_CONTROL 341 } - { KEY_LEFT_ALT 342 } - { KEY_RIGHT_SHIFT 344 } - { KEY_RIGHT_CONTROL 345 } - { KEY_RIGHT_ALT 346 } - { KEY_GRAVE 96 } - { KEY_SLASH 47 } + { KEY_SPACE 32 } + { KEY_ESCAPE 256 } + { KEY_ENTER 257 } + { KEY_TAB 258 } + { KEY_BACKSPACE 259 } + { KEY_INSERT 260 } + { KEY_DELETE 261 } + { KEY_RIGHT 262 } + { KEY_LEFT 263 } + { KEY_DOWN 264 } + { KEY_UP 265 } + { KEY_PAGE_UP 266 } + { KEY_PAGE_DOWN 267 } + { KEY_HOME 268 } + { KEY_END 269 } + { KEY_CAPS_LOCK 280 } + { KEY_SCROLL_LOCK 281 } + { KEY_NUM_LOCK 282 } + { KEY_PRINT_SCREEN 283 } + { KEY_PAUSE 284 } + { KEY_F1 290 } + { KEY_F2 291 } + { KEY_F3 292 } + { KEY_F4 293 } + { KEY_F5 294 } + { KEY_F6 295 } + { KEY_F7 296 } + { KEY_F8 297 } + { KEY_F9 298 } + { KEY_F10 299 } + { KEY_F11 300 } + { KEY_F12 301 } + { KEY_LEFT_SHIFT 340 } + { KEY_LEFT_CONTROL 341 } + { KEY_LEFT_ALT 342 } + { KEY_RIGHT_SHIFT 344 } + { KEY_RIGHT_CONTROL 345 } + { KEY_RIGHT_ALT 346 } + { KEY_GRAVE 96 } + { KEY_SLASH 47 } { KEY_BACKSLASH 92 } ; -ENUM: KeyboardAlphaNumericKeys - { KEY_ZERO 48 } - { KEY_ONE 49 } - { KEY_TWO 50 } - { KEY_THREE 51 } - { KEY_FOUR 52 } - { KEY_FIVE 53 } - { KEY_SIX 54 } - { KEY_SEVEN 55 } - { KEY_EIGHT 56 } - { KEY_NINE 57 } - { KEY_A 65 } - { KEY_B 66 } - { KEY_C 67 } - { KEY_D 68 } - { KEY_E 69 } - { KEY_F 70 } - { KEY_G 71 } - { KEY_H 72 } - { KEY_I 73 } - { KEY_J 74 } - { KEY_K 75 } - { KEY_L 76 } - { KEY_M 77 } - { KEY_N 78 } - { KEY_O 79 } - { KEY_P 80 } - { KEY_Q 81 } - { KEY_R 82 } - { KEY_S 83 } - { KEY_T 84 } - { KEY_U 85 } - { KEY_V 86 } - { KEY_W 87 } - { KEY_X 88 } - { KEY_Y 89 } +ENUM: KeyboardAlphaNumericKeys + { KEY_ZERO 48 } + { KEY_ONE 49 } + { KEY_TWO 50 } + { KEY_THREE 51 } + { KEY_FOUR 52 } + { KEY_FIVE 53 } + { KEY_SIX 54 } + { KEY_SEVEN 55 } + { KEY_EIGHT 56 } + { KEY_NINE 57 } + { KEY_A 65 } + { KEY_B 66 } + { KEY_C 67 } + { KEY_D 68 } + { KEY_E 69 } + { KEY_F 70 } + { KEY_G 71 } + { KEY_H 72 } + { KEY_I 73 } + { KEY_J 74 } + { KEY_K 75 } + { KEY_L 76 } + { KEY_M 77 } + { KEY_N 78 } + { KEY_O 79 } + { KEY_P 80 } + { KEY_Q 81 } + { KEY_R 82 } + { KEY_S 83 } + { KEY_T 84 } + { KEY_U 85 } + { KEY_V 86 } + { KEY_W 87 } + { KEY_X 88 } + { KEY_Y 89 } { KEY_Z 90 } ; : LIGHTGRAY ( -- Color ) 200 200 200 255 Color ; ! Light Gray @@ -385,8 +385,8 @@ ENUM: ShaderLocationIndex LOC_COLOR_DIFFUSE LOC_COLOR_SPECULAR LOC_COLOR_AMBIENT - LOC_MAP_ALBEDO - LOC_MAP_METALNESS + LOC_MAP_ALBEDO + LOC_MAP_METALNESS LOC_MAP_NORMAL LOC_MAP_ROUGHNESS LOC_MAP_OCCLUSION @@ -399,16 +399,16 @@ ENUM: ShaderLocationIndex ! Material map type ENUM: TexmapIndex - MAP_ALBEDO - MAP_METALNESS - MAP_NORMAL - MAP_ROUGHNESS + MAP_ALBEDO + MAP_METALNESS + MAP_NORMAL + MAP_ROUGHNESS MAP_OCCLUSION MAP_EMISSION MAP_HEIGHT - MAP_CUBEMAP - MAP_IRRADIANCE - MAP_PREFILTER + MAP_CUBEMAP + MAP_IRRADIANCE + MAP_PREFILTER MAP_BRDF ; ! Pixel formats @@ -1023,10 +1023,8 @@ FUNCTION-ALIAS: set-audio-stream-volume void SetAudioStreamVolume ( AudioStream FUNCTION-ALIAS: set-audio-stream-pitch void SetAudioStreamPitch ( AudioStream stream, float pitch ) ! Set pitch for audio stream ( 1.0 is base level ) ! Load modules depending on what the installed dll/so supports -"raylib" find-library dlopen dup +"raylib" find-library dlopen dup ! Check for ricons symbols "DrawIcon" swap dlsym [ "raylib.modules.ricons" require ] when ! Check for gui symbols -"GuiEnable" swap dlsym [ "raylib.modules.gui" require ] when - - +"GuiEnable" swap dlsym [ "raylib.modules.gui" require ] when diff --git a/extra/raylib/gui-demo/gui-demo.factor b/extra/raylib/gui-demo/gui-demo.factor index 6afb2cd796..63ff4d3a8e 100644 --- a/extra/raylib/gui-demo/gui-demo.factor +++ b/extra/raylib/gui-demo/gui-demo.factor @@ -33,7 +33,7 @@ IN: raylib.gui-demo rl-gui-unlock ; : render-loop ( -- ) - begin-drawing white-background + begin-drawing white-background say-hello render-gui end-drawing ; : main ( -- ) diff --git a/extra/raylib/modules/gui/gui.factor b/extra/raylib/modules/gui/gui.factor index 772ccfedac..febbc3c966 100644 --- a/extra/raylib/modules/gui/gui.factor +++ b/extra/raylib/modules/gui/gui.factor @@ -25,7 +25,7 @@ ENUM: GuiTextAlignment ! Gui standard controls ENUM: GuiControlStandard - DEFAULT + DEFAULT LABEL ! LABELBUTTON BUTTON ! IMAGEBUTTON TOGGLE ! TOGGLEGROUP diff --git a/extra/raylib/modules/ricons/ricons.factor b/extra/raylib/modules/ricons/ricons.factor index 8366424fb3..edf67b7590 100644 --- a/extra/raylib/modules/ricons/ricons.factor +++ b/extra/raylib/modules/ricons/ricons.factor @@ -9,7 +9,7 @@ IN: raylib.modules.ricons FUNCTION-ALIAS: rl-draw-icon void DrawIcon ( int iconId, Vector2 position, int pixelSize, Color color ) ENUM: rIconDescription - RICON_NONE + RICON_NONE RICON_FOLDER_FILE_OPEN RICON_FILE_SAVE_CLASSIC RICON_FOLDER_OPEN @@ -208,4 +208,3 @@ ENUM: rIconDescription RICON_LAYERS_VISIBLE RICON_LAYERS RICON_WINDOW ; - diff --git a/extra/zealot/help-lint/help-lint.factor b/extra/zealot/help-lint/help-lint.factor index 76b6f5a67f..0fbc134425 100644 --- a/extra/zealot/help-lint/help-lint.factor +++ b/extra/zealot/help-lint/help-lint.factor @@ -27,4 +27,4 @@ CONSTANT: ignored-resources { : zealot-help-lint-main ( -- ) t zealot-help-lint ; -MAIN: zealot-help-lint-main \ No newline at end of file +MAIN: zealot-help-lint-main