From cc44bd2a7354f045e37cdfa0996c89b5c0d8f5cf Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 7 May 2018 13:42:56 +0200 Subject: [PATCH] Updated rfxgen layout, Added style loading function to rguistyler - Changed rfxgen controls name - Added function to load styles from palettes.png files --- tools/rGuiLayout/layouts/rfxgen.rgl | 216 ++++++++++++++-------------- tools/rGuiStyler/rguistyler.c | 6 +- 2 files changed, 113 insertions(+), 109 deletions(-) diff --git a/tools/rGuiLayout/layouts/rfxgen.rgl b/tools/rGuiLayout/layouts/rfxgen.rgl index 46a1a76..430691d 100644 --- a/tools/rGuiLayout/layouts/rfxgen.rgl +++ b/tools/rGuiLayout/layouts/rfxgen.rgl @@ -13,111 +13,111 @@ a 004 0 0 0 a 005 0 0 0 a 006 0 0 0 a 007 0 0 0 -c 000 5 PickupCoin 10 45 95 20 1 Pickup/Coin -c 001 5 LaserShoot 10 70 95 20 1 Laser/Shoot -c 002 5 Explosion 10 95 95 20 1 Explosion -c 003 5 Powerup 10 120 95 20 1 Powerup -c 004 5 HitHurt 10 145 95 20 1 Hit/Hurt -c 005 5 Jump 10 170 95 20 1 Jump -c 006 5 BlipSelect 10 195 95 20 1 Blip/Select -c 007 5 Mutate 10 364 95 20 1 Mutate -c 008 5 Randomize 10 389 95 20 1 Randomize -c 009 5 LoadSound 390 283 95 20 1 Load Sound -c 010 5 SaveSound 390 307 95 20 1 Save Sound -c 011 5 ExportWav 390 389 95 20 1 Export Wav -c 012 5 PlaySound 390 81 95 20 1 Play Sound -c 013 8 CheckBox014 390 115 10 10 1 SAMPLE TEXT -c 014 4 Label015 405 110 80 20 1 Play on change -c 015 4 Label016 390 135 80 20 1 powered by -c 016 4 Label017 405 250 70 20 1 www.raylib.com -c 017 4 VOLUME 390 49 95 20 1 VOLUME: 60% -c 018 15 SliderBar019 390 65 95 10 1 SAMPLE TEXT -c 019 9 ComboBox020 390 340 95 20 1 SAMPLE TEXT -c 020 9 ComboBox021 390 364 95 20 1 SAMPLE TEXT -c 021 7 ToggleGroup022 115 15 265 20 1 SAMPLE TEXT -c 022 4 Label023 15 235 90 20 1 based on sfxr by -c 023 4 Label024 10 248 98 20 1 Tomas Pettersson -c 024 4 Label025 20 320 85 20 1 www.github.com/ -c 025 4 Label026 20 335 85 20 1 raysan5/raylib -c 026 15 SliderBar027 130 8 100 10 2 SAMPLE TEXT -c 027 15 SliderBar028 130 23 100 10 2 SAMPLE TEXT -c 028 15 SliderBar029 130 38 100 10 2 SAMPLE TEXT -c 029 15 SliderBar030 130 53 100 10 2 SAMPLE TEXT -c 030 15 SliderBar031 130 74 100 10 2 SAMPLE TEXT -c 031 15 SliderBar032 130 89 100 10 2 SAMPLE TEXT -c 032 15 SliderBar033 130 104 100 10 2 SAMPLE TEXT -c 033 15 SliderBar034 130 119 100 10 2 SAMPLE TEXT -c 034 15 SliderBar035 130 134 100 10 2 SAMPLE TEXT -c 035 15 SliderBar036 130 149 100 10 2 SAMPLE TEXT -c 036 15 SliderBar037 130 170 100 10 2 SAMPLE TEXT -c 037 15 SliderBar038 130 185 100 10 2 SAMPLE TEXT -c 038 15 SliderBar039 130 206 100 10 2 SAMPLE TEXT -c 039 15 SliderBar040 130 221 100 10 2 SAMPLE TEXT -c 040 15 SliderBar041 130 242 100 10 2 SAMPLE TEXT -c 041 15 SliderBar042 130 263 100 10 2 SAMPLE TEXT -c 042 15 SliderBar043 130 278 100 10 2 SAMPLE TEXT -c 043 15 SliderBar044 130 299 100 10 2 SAMPLE TEXT -c 044 15 SliderBar045 130 314 100 10 2 SAMPLE TEXT -c 045 15 SliderBar046 130 329 100 10 2 SAMPLE TEXT -c 046 15 SliderBar047 130 344 100 10 2 SAMPLE TEXT -c 047 15 SliderBar048 130 359 100 10 2 SAMPLE TEXT -c 048 4 Label049 235 355 20 20 2 0.00 -c 049 4 Label050 235 4 25 20 2 0.00 -c 050 4 Label051 235 34 20 20 2 0.00 -c 051 4 Label052 235 85 20 20 2 0.00 -c 052 4 Label053 235 100 20 20 2 0.00 -c 053 4 Label054 235 115 20 20 2 0.00 -c 054 4 Label055 235 130 20 20 2 0.00 -c 055 4 Label056 235 145 20 20 2 0.00 -c 056 4 Label057 235 166 20 20 2 0.00 -c 057 4 Label058 235 181 20 20 2 0.00 -c 058 4 Label059 235 202 20 20 2 0.00 -c 059 4 Label060 235 217 19 20 2 0.00 -c 060 4 Label061 235 238 19 20 2 0.00 -c 061 4 Label062 235 259 19 20 2 0.00 -c 062 4 Label063 235 295 20 20 2 1.00 -c 063 4 Label064 235 310 20 20 2 0.00 -c 064 4 Label065 235 325 20 20 2 0.00 -c 065 4 Label066 235 340 20 20 2 0.00 -c 066 4 Label067 235 70 20 20 2 0.30 -c 067 4 Label068 235 19 20 20 2 0.30 -c 068 4 Label069 235 49 20 20 2 0.40 -c 069 4 Label070 235 274 19 20 2 0.00 -c 070 4 Label071 43 3 80 20 2 ATTACK TIME -c 071 4 Label072 40 18 81 20 2 SUSTAIN TIME -c 072 4 Label073 32 33 90 20 2 SUSTAIN PUNCH -c 073 4 Label074 52 48 70 20 2 DECAY TIME -c 074 4 Label075 14 69 103 20 2 START FREQUENCY -c 075 4 Label076 32 84 90 20 2 MIN FREQUENCY -c 076 4 Label077 87 99 30 20 2 SLIDE -c 077 4 Label078 48 114 70 20 2 DELTA SLIDE -c 078 4 Label079 31 144 90 20 2 VIBRATO SPEED -c 079 4 Label080 30 129 90 20 2 VIBRATO DEPTH -c 080 4 Label081 28 165 90 20 2 CHANGE AMOUNT -c 081 4 Label082 37 180 80 20 2 CHANGE SPEED -c 082 4 Label083 43 201 80 20 2 SQUARE DUTY -c 083 4 Label084 49 216 68 20 2 DUTY SWEEP -c 084 4 Label085 36 237 81 20 2 REPEAT SPEED -c 085 4 Label086 36 273 81 20 2 PHASER SWEEP -c 086 4 Label087 29 258 88 20 2 PHASER OFFSET -c 087 4 Label088 11 309 106 20 2 LPF CUTOFF SWEEP -c 088 4 Label089 51 294 66 20 2 LPF CUTOFF -c 089 4 Label090 31 324 86 20 2 LPF RESONANCE -c 090 4 Label091 10 354 107 20 2 HPF CUTOFF SWEEP -c 091 4 Label092 50 339 67 20 2 HPF CUTOFF -c 092 4 Label093 20 280 85 20 1 www.github.com/ -c 093 4 Label094 20 295 85 20 1 raysan5/raygui -c 094 20 DummyRec095 390 153 95 95 1 LOGO -c 095 20 DummyRec096 25 15 80 20 1 Version -c 096 20 DummyRec097 10 420 475 50 1 WAVE -c 097 1 GroupBox098 0 0 265 71 2 -c 098 1 GroupBox099 0 70 265 96 2 -c 099 1 GroupBox100 0 165 265 36 2 -c 100 1 GroupBox101 0 235 265 21 2 -c 101 1 GroupBox102 0 200 265 36 2 -c 102 1 GroupBox103 0 290 265 85 2 -c 103 1 GroupBox104 0 255 265 36 2 -c 104 17 StatusBar105 0 480 201 20 1 SOUND INFO: Num samples: -c 105 17 StatusBar106 200 480 126 20 1 Duration -c 106 17 StatusBar107 325 480 175 20 1 Wave size -c 107 6 Toggle108 440 65 95 20 0 Screen Size x2 +c 000 20 version 25 15 80 20 1 Version +c 001 5 PickupCoin 10 45 95 20 1 Pickup/Coin +c 002 5 LaserShoot 10 70 95 20 1 Laser/Shoot +c 003 5 Explosion 10 95 95 20 1 Explosion +c 004 5 Powerup 10 120 95 20 1 Powerup +c 005 5 HitHurt 10 145 95 20 1 Hit/Hurt +c 006 5 Jump 10 170 95 20 1 Jump +c 007 5 BlipSelect 10 195 95 20 1 Blip/Select +c 008 4 lblInfo01 15 235 90 20 1 based on sfxr by +c 009 4 lblInfo02 10 248 98 20 1 Tomas Pettersson +c 010 4 lblInfo03 20 280 85 20 1 www.github.com/ +c 011 4 lblInfo04 20 295 85 20 1 raysan5/raygui +c 012 4 lblInfo05 20 320 85 20 1 www.github.com/ +c 013 4 lblInfo06 20 335 85 20 1 raysan5/raylib +c 014 5 Mutate 10 364 95 20 1 Mutate +c 015 5 Randomize 10 389 95 20 1 Randomize +c 016 7 waveType 115 15 265 20 1 SAMPLE TEXT +c 017 6 screenSize 440 65 95 20 0 Screen Size x2 +c 018 4 lblVolume 390 49 95 20 1 VOLUME: 60% +c 019 15 volume 390 65 95 10 1 SAMPLE TEXT +c 020 5 PlaySound 390 81 95 20 1 Play Sound +c 021 8 playOnChange 390 115 10 10 1 SAMPLE TEXT +c 022 4 lblPlayOnChange 405 110 80 20 1 Play on change +c 023 4 lblPoweredBy 390 135 80 20 1 powered by +c 024 20 logo 390 153 95 95 1 LOGO +c 025 4 lblRaylibDotCom 405 250 70 20 1 www.raylib.com +c 026 5 LoadSound 390 283 95 20 1 Load Sound +c 027 5 SaveSound 390 307 95 20 1 Save Sound +c 028 9 sampleRate 390 340 95 20 1 SAMPLE TEXT +c 029 9 sampleSize 390 364 95 20 1 SAMPLE TEXT +c 030 5 ExportWav 390 389 95 20 1 Export Wav +c 031 1 GroupBox098 0 0 265 71 2 +c 032 1 GroupBox099 0 70 265 96 2 +c 033 1 GroupBox100 0 165 265 36 2 +c 034 1 GroupBox102 0 200 265 36 2 +c 035 1 GroupBox101 0 235 265 21 2 +c 036 1 GroupBox104 0 255 265 36 2 +c 037 1 GroupBox103 0 290 265 85 2 +c 038 4 lblAttackTime 43 3 80 20 2 ATTACK TIME +c 039 4 lblSustainTime 40 18 81 20 2 SUSTAIN TIME +c 040 4 lblSustainPunch 32 33 90 20 2 SUSTAIN PUNCH +c 041 4 lblDecayTime 52 48 70 20 2 DECAY TIME +c 042 4 lblStartFrequency 14 69 103 20 2 START FREQUENCY +c 043 4 lblMinFrequency 32 84 90 20 2 MIN FREQUENCY +c 044 4 lblSlide 87 99 30 20 2 SLIDE +c 045 4 lblDeltaSlide 48 114 70 20 2 DELTA SLIDE +c 046 4 lblVibratoDepth 30 129 90 20 2 VIBRATO DEPTH +c 047 4 lblVibratoSpeed 31 144 90 20 2 VIBRATO SPEED +c 048 4 lblChangeAmount 28 165 90 20 2 CHANGE AMOUNT +c 049 4 lblChangeSpeed 37 180 80 20 2 CHANGE SPEED +c 050 4 lblSquareDuty 43 201 80 20 2 SQUARE DUTY +c 051 4 lblDutySweep 49 216 68 20 2 DUTY SWEEP +c 052 4 lblRepeatSpeed 36 237 81 20 2 REPEAT SPEED +c 053 4 lblPhaserOffset 29 258 88 20 2 PHASER OFFSET +c 054 4 lblPhaserSweep 36 273 81 20 2 PHASER SWEEP +c 055 4 lblLPFCutoff 51 294 66 20 2 LPF CUTOFF +c 056 4 lblLPFCutoffSweep 11 309 106 20 2 LPF CUTOFF SWEEP +c 057 4 lblLPFResonance 31 324 86 20 2 LPF RESONANCE +c 058 4 lblHPFCutoff 50 339 67 20 2 HPF CUTOFF +c 059 4 lblHPFCutoffSweep 10 354 107 20 2 HPF CUTOFF SWEEP +c 060 15 attackTime 130 8 100 10 2 SAMPLE TEXT +c 061 15 sustainTime 130 23 100 10 2 SAMPLE TEXT +c 062 15 sustainPunch 130 38 100 10 2 SAMPLE TEXT +c 063 15 decayTime 130 53 100 10 2 SAMPLE TEXT +c 064 15 startFrequency 130 74 100 10 2 SAMPLE TEXT +c 065 15 minFrequency 130 89 100 10 2 SAMPLE TEXT +c 066 15 slide 130 104 100 10 2 SAMPLE TEXT +c 067 15 deltaSlide 130 119 100 10 2 SAMPLE TEXT +c 068 15 vibratoDepth 130 134 100 10 2 SAMPLE TEXT +c 069 15 vibratoSpeed 130 149 100 10 2 SAMPLE TEXT +c 070 15 changeAmount 130 170 100 10 2 SAMPLE TEXT +c 071 15 changeSpeed 130 185 100 10 2 SAMPLE TEXT +c 072 15 squareDuty 130 206 100 10 2 SAMPLE TEXT +c 073 15 dutySweep 130 221 100 10 2 SAMPLE TEXT +c 074 15 repeatSpeed 130 242 100 10 2 SAMPLE TEXT +c 075 15 phaserOffset 130 263 100 10 2 SAMPLE TEXT +c 076 15 phaserSweep 130 278 100 10 2 SAMPLE TEXT +c 077 15 lpfCutoff 130 299 100 10 2 SAMPLE TEXT +c 078 15 lpfCutoffSweep 130 314 100 10 2 SAMPLE TEXT +c 079 15 lpfResonance 130 329 100 10 2 SAMPLE TEXT +c 080 15 hpfCutoff 130 344 100 10 2 SAMPLE TEXT +c 081 15 hpfCutoffSweep 130 359 100 10 2 SAMPLE TEXT +c 082 4 textAttackTime 235 4 25 20 2 0.00 +c 083 4 textSustainTime 235 19 20 20 2 0.30 +c 084 4 textSustainPunch 235 34 20 20 2 0.00 +c 085 4 textDecayTime 235 49 20 20 2 0.40 +c 086 4 textStartFrequency 235 70 20 20 2 0.30 +c 087 4 textMinFrequency 235 85 20 20 2 0.00 +c 088 4 textSlide 235 100 20 20 2 0.00 +c 089 4 textDeltaSlide 235 115 20 20 2 0.00 +c 090 4 textVibratoDepth 235 130 20 20 2 0.00 +c 091 4 textVibratoSpeed 235 145 20 20 2 0.00 +c 092 4 textChangeAmount 235 166 20 20 2 0.00 +c 093 4 textChangeSpeed 235 181 20 20 2 0.00 +c 094 4 textSquareDuty 235 202 20 20 2 0.00 +c 095 4 textDutySweep 235 217 19 20 2 0.00 +c 096 4 textRepeatSpeed 235 238 19 20 2 0.00 +c 097 4 textPhaserOffset 235 259 19 20 2 0.00 +c 098 4 textPhaserSweep 235 274 19 20 2 0.00 +c 099 4 textLPFCutoff 235 295 20 20 2 1.00 +c 100 4 textLPFCutoff 235 310 20 20 2 0.00 +c 101 4 textLPFResonance 235 325 20 20 2 0.00 +c 102 4 textHPFCutoff 235 340 20 20 2 0.00 +c 103 4 textHPFCutoffSweep 235 355 20 20 2 0.00 +c 104 20 Wave 10 420 475 50 1 WAVE +c 105 17 soundInfo 0 480 201 20 1 SOUND INFO: Num samples: +c 106 17 duration 200 480 126 20 1 Duration +c 107 17 waveSize 325 480 175 20 1 Wave size diff --git a/tools/rGuiStyler/rguistyler.c b/tools/rGuiStyler/rguistyler.c index dc0dc45..bbce6a6 100644 --- a/tools/rGuiStyler/rguistyler.c +++ b/tools/rGuiStyler/rguistyler.c @@ -440,7 +440,11 @@ int main(int argc, char *argv[]) { currentSelectedControl = -1; droppedFiles = GetDroppedFiles(&dropsCount); - GuiLoadStyle(droppedFiles[0]); + if (IsFileExtension(droppedFiles[0], ".png")) + { + GuiLoadStyleImage(droppedFiles[0]); + } + else if (IsFileExtension(droppedFiles[0], ".rgs")) GuiLoadStyle(droppedFiles[0]); for (int i = 0; i < 12; i++) colorBoxValue[i] = GetColor(style[DEFAULT_BORDER_COLOR_NORMAL + i]); ClearDroppedFiles(); }