From b90d133377c259d00477491d9a58319fece77f14 Mon Sep 17 00:00:00 2001 From: Gene Pasquet Date: Sun, 26 May 2024 12:09:48 +0100 Subject: Reorganise game files --- 7segment-background.png | Bin 160 -> 0 bytes DSEG-LICENSE.txt | 95 -------------- DSEG7Classic-Regular.ttf | Bin 23272 -> 0 bytes dash-background.png | Bin 303 -> 0 bytes engine-loop-1.ogg | Bin 58862 -> 0 bytes fonts/DSEG-LICENSE.txt | 95 ++++++++++++++ fonts/DSEG7Classic-Regular.ttf | Bin 0 -> 23272 bytes fonts/thick_8x8.png | Bin 0 -> 1197 bytes fonts/thick_8x8.xml | 276 ++++++++++++++++++++++++++++++++++++++++ grass.png | Bin 3706 -> 0 bytes music.ogg | Bin 5237415 -> 0 bytes road.png | Bin 2091 -> 0 bytes sound/engine-loop-1.ogg | Bin 0 -> 58862 bytes sound/music.ogg | Bin 0 -> 5237415 bytes sprites/7segment-background.png | Bin 0 -> 160 bytes sprites/dash-background.png | Bin 0 -> 303 bytes sprites/grass.png | Bin 0 -> 3706 bytes sprites/road.png | Bin 0 -> 2091 bytes sprites/vehicles.png | Bin 0 -> 6438 bytes thick_8x8.png | Bin 1197 -> 0 bytes thick_8x8.xml | 276 ---------------------------------------- turbo.scm | 16 +-- 22 files changed, 379 insertions(+), 379 deletions(-) delete mode 100644 7segment-background.png delete mode 100755 DSEG-LICENSE.txt delete mode 100644 DSEG7Classic-Regular.ttf delete mode 100644 dash-background.png delete mode 100644 engine-loop-1.ogg create mode 100755 fonts/DSEG-LICENSE.txt create mode 100644 fonts/DSEG7Classic-Regular.ttf create mode 100644 fonts/thick_8x8.png create mode 100644 fonts/thick_8x8.xml delete mode 100644 grass.png delete mode 100644 music.ogg delete mode 100644 road.png create mode 100644 sound/engine-loop-1.ogg create mode 100644 sound/music.ogg create mode 100644 sprites/7segment-background.png create mode 100644 sprites/dash-background.png create mode 100644 sprites/grass.png create mode 100644 sprites/road.png create mode 100644 sprites/vehicles.png delete mode 100644 thick_8x8.png delete mode 100644 thick_8x8.xml diff --git a/7segment-background.png b/7segment-background.png deleted file mode 100644 index 56c1edd..0000000 Binary files a/7segment-background.png and /dev/null differ diff --git a/DSEG-LICENSE.txt b/DSEG-LICENSE.txt deleted file mode 100755 index ad4c0bf..0000000 --- a/DSEG-LICENSE.txt +++ /dev/null @@ -1,95 +0,0 @@ -Copyright (c) 2017, keshikan (http://www.keshikan.net), -with Reserved Font Name "DSEG". - - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/DSEG7Classic-Regular.ttf b/DSEG7Classic-Regular.ttf deleted file mode 100644 index 5e02edc..0000000 Binary files a/DSEG7Classic-Regular.ttf and /dev/null differ diff --git a/dash-background.png b/dash-background.png deleted file mode 100644 index abb8e60..0000000 Binary files a/dash-background.png and /dev/null differ diff --git a/engine-loop-1.ogg b/engine-loop-1.ogg deleted file mode 100644 index d4fe9c6..0000000 Binary files a/engine-loop-1.ogg and /dev/null differ diff --git a/fonts/DSEG-LICENSE.txt b/fonts/DSEG-LICENSE.txt new file mode 100755 index 0000000..ad4c0bf --- /dev/null +++ b/fonts/DSEG-LICENSE.txt @@ -0,0 +1,95 @@ +Copyright (c) 2017, keshikan (http://www.keshikan.net), +with Reserved Font Name "DSEG". + + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/DSEG7Classic-Regular.ttf b/fonts/DSEG7Classic-Regular.ttf new file mode 100644 index 0000000..5e02edc Binary files /dev/null and b/fonts/DSEG7Classic-Regular.ttf differ diff --git a/fonts/thick_8x8.png b/fonts/thick_8x8.png new file mode 100644 index 0000000..8f5fd09 Binary files /dev/null and b/fonts/thick_8x8.png differ diff --git a/fonts/thick_8x8.xml b/fonts/thick_8x8.xml new file mode 100644 index 0000000..78f80c8 --- /dev/null +++ b/fonts/thick_8x8.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/grass.png b/grass.png deleted file mode 100644 index 64d1261..0000000 Binary files a/grass.png and /dev/null differ diff --git a/music.ogg b/music.ogg deleted file mode 100644 index d33c37d..0000000 Binary files a/music.ogg and /dev/null differ diff --git a/road.png b/road.png deleted file mode 100644 index c85bc43..0000000 Binary files a/road.png and /dev/null differ diff --git a/sound/engine-loop-1.ogg b/sound/engine-loop-1.ogg new file mode 100644 index 0000000..d4fe9c6 Binary files /dev/null and b/sound/engine-loop-1.ogg differ diff --git a/sound/music.ogg b/sound/music.ogg new file mode 100644 index 0000000..d33c37d Binary files /dev/null and b/sound/music.ogg differ diff --git a/sprites/7segment-background.png b/sprites/7segment-background.png new file mode 100644 index 0000000..56c1edd Binary files /dev/null and b/sprites/7segment-background.png differ diff --git a/sprites/dash-background.png b/sprites/dash-background.png new file mode 100644 index 0000000..abb8e60 Binary files /dev/null and b/sprites/dash-background.png differ diff --git a/sprites/grass.png b/sprites/grass.png new file mode 100644 index 0000000..64d1261 Binary files /dev/null and b/sprites/grass.png differ diff --git a/sprites/road.png b/sprites/road.png new file mode 100644 index 0000000..c85bc43 Binary files /dev/null and b/sprites/road.png differ diff --git a/sprites/vehicles.png b/sprites/vehicles.png new file mode 100644 index 0000000..5baa20e Binary files /dev/null and b/sprites/vehicles.png differ diff --git a/thick_8x8.png b/thick_8x8.png deleted file mode 100644 index 8f5fd09..0000000 Binary files a/thick_8x8.png and /dev/null differ diff --git a/thick_8x8.xml b/thick_8x8.xml deleted file mode 100644 index 78f80c8..0000000 --- a/thick_8x8.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/turbo.scm b/turbo.scm index 7419a54..f2b5b07 100644 --- a/turbo.scm +++ b/turbo.scm @@ -9,27 +9,27 @@ ;;;; Constants and variables -(define the-font (load-bitmap-font "thick_8x8.xml")) -(define font-7-segments (load-font "DSEG7Classic-Regular.ttf" 24)) +(define the-font (load-bitmap-font "fonts/thick_8x8.xml")) +(define font-7-segments (load-font "fonts/DSEG7Classic-Regular.ttf" 24)) (define lane-height 65) (define lane-length 192) (define road-start-y 80) (define road-section-position 0) -(define road (load-tileset "road.png" lane-length lane-height)) +(define road (load-tileset "sprites/road.png" lane-length lane-height)) (define road-num-lanes 5) (define road-end-y (+ road-start-y (* road-num-lanes lane-height))) (define road-top (texture-atlas-ref road 2)) (define road-bottom (texture-atlas-ref road 0)) (define road-lane (texture-atlas-ref road 1)) -(define grass (load-image "grass.png")) -(define dashboard-set (load-tileset "dash-background.png" 64 64)) +(define grass (load-image "sprites/grass.png")) +(define dashboard-set (load-tileset "sprites/dash-background.png" 64 64)) (define dash-background (texture-atlas-ref dashboard-set 0)) (define dash-7seg-background (texture-atlas-ref dashboard-set 1)) (define grass-height 96) -(define vehicles-sprites (load-tileset "vehicles.png" vehicle-length vehicle-height)) +(define vehicles-sprites (load-tileset "sprites/vehicles.png" vehicle-length vehicle-height)) (define player-velocity (vec2 0 0)) (define player-min-speed 250) @@ -51,9 +51,9 @@ (define level-difficulty 1) (define max-level 20) -(define music-res (load-audio "music.ogg")) +(define music-res (load-audio "sound/music.ogg")) (define music (make-source #:audio music-res #:loop? #t)) -(define engine-res (load-audio "engine-loop-1.ogg")) +(define engine-res (load-audio "sound/engine-loop-1.ogg")) (define engine-sound (make-source #:audio engine-res #:loop? #t)) (define (calculate-vehicle-position lane) -- cgit v1.2.3