Skip to content

Commit 8d14e1d

Browse files
committed
Cleanup music example
1 parent 532411e commit 8d14e1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+8
-164
lines changed
-880 Bytes
Binary file not shown.
-888 Bytes
Binary file not shown.
-43.2 KB
Binary file not shown.
-42.9 KB
Binary file not shown.
-43.2 KB
Binary file not shown.
-42.8 KB
Binary file not shown.
-43 KB
Binary file not shown.
-42.6 KB
Binary file not shown.
-42.9 KB
Binary file not shown.
-42.7 KB
Binary file not shown.
-42.8 KB
Binary file not shown.
-42.6 KB
Binary file not shown.
-42.2 KB
Binary file not shown.
-42.2 KB
Binary file not shown.
-42.4 KB
Binary file not shown.
-42.4 KB
Binary file not shown.
-42.6 KB
Binary file not shown.
-42.4 KB
Binary file not shown.
-42.5 KB
Binary file not shown.
-42.2 KB
Binary file not shown.
-42.6 KB
Binary file not shown.
-42.1 KB
Binary file not shown.
-42.8 KB
Binary file not shown.
-42.4 KB
Binary file not shown.
-43 KB
Binary file not shown.
-42.8 KB
Binary file not shown.
-43.6 KB
Binary file not shown.
-53 KB
Binary file not shown.
-51.3 KB
Binary file not shown.
-54.2 KB
Binary file not shown.
-57.3 KB
Binary file not shown.
-61.2 KB
Binary file not shown.
-64.7 KB
Binary file not shown.
-62.9 KB
Binary file not shown.
-61.4 KB
Binary file not shown.
-43.1 KB
Binary file not shown.
-20.6 KB
Binary file not shown.
-20.9 KB
Binary file not shown.
-21.9 KB
Binary file not shown.
-22.1 KB
Binary file not shown.
-22.1 KB
Binary file not shown.
-22.5 KB
Binary file not shown.
-22.3 KB
Binary file not shown.
-21.6 KB
Binary file not shown.
-20.9 KB
Binary file not shown.
-3.42 KB
Binary file not shown.
-3.88 KB
Binary file not shown.

sound/music/assets/images/carrot.png

-1.35 KB
Binary file not shown.

sound/music/assets/images/close.png

-2.74 KB
Binary file not shown.
-4.88 KB
Binary file not shown.
-4.5 KB
Binary file not shown.
-3.63 KB
Binary file not shown.
-787 Bytes
Binary file not shown.
-3.59 KB
Binary file not shown.
-191 Bytes
Binary file not shown.
-1.5 KB
Binary file not shown.
-822 Bytes
Binary file not shown.
-1.01 KB
Binary file not shown.
-2.95 KB
Binary file not shown.
-776 Bytes
Binary file not shown.

sound/music/assets/images/flame.png

-699 Bytes
Binary file not shown.
-444 Bytes
Binary file not shown.

sound/music/assets/images/grid.png

-57.2 KB
Binary file not shown.

sound/music/assets/images/header.png

-97.5 KB
Binary file not shown.
-1.37 KB
Binary file not shown.
-2.84 KB
Binary file not shown.
-1.43 KB
Binary file not shown.
-13.8 KB
Binary file not shown.
-835 Bytes
Binary file not shown.
-3.1 KB
Binary file not shown.
-8.65 KB
Binary file not shown.
-2.65 KB
Binary file not shown.

sound/music/assets/images/rainbow.png

-89.6 KB
Binary file not shown.
-311 Bytes
Binary file not shown.
-4.09 KB
Binary file not shown.
-3.65 KB
Binary file not shown.
-4.26 KB
Binary file not shown.

sound/music/assets/images/smoke.png

-402 Bytes
Binary file not shown.

sound/music/assets/images/spinner.png

-4.01 KB
Binary file not shown.
-91.6 KB
Binary file not shown.

sound/music/assets/sprites.atlas

-89
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,4 @@
1-
images {
2-
image: "/assets/images/spinner.png"
3-
}
4-
images {
5-
image: "/assets/images/elementStone019.png"
6-
}
7-
images {
8-
image: "/assets/images/elementStone023.png"
9-
}
10-
images {
11-
image: "/assets/images/bunny1_ready.png"
12-
}
13-
images {
14-
image: "/assets/images/bunny2_ready.png"
15-
}
16-
images {
17-
image: "/assets/images/carrot.png"
18-
}
19-
images {
20-
image: "/assets/images/red_button12.png"
21-
}
22-
images {
23-
image: "/assets/images/flame.png"
24-
}
25-
images {
26-
image: "/assets/images/smoke.png"
27-
}
28-
images {
29-
image: "/assets/images/rainbow.png"
30-
}
31-
images {
32-
image: "/assets/images/enemyFloating_1.png"
33-
}
34-
images {
35-
image: "/assets/images/logo-color.png"
36-
}
371
images {
382
image: "/assets/images/shipGreen_manned.png"
393
}
40-
images {
41-
image: "/assets/images/elementMetal001.png"
42-
}
43-
images {
44-
image: "/assets/images/plank_slice.png"
45-
}
46-
images {
47-
image: "/assets/images/hitman1_machine.png"
48-
}
49-
images {
50-
image: "/assets/images/green_button03.png"
51-
}
52-
images {
53-
image: "/assets/images/playerShip1_red.png"
54-
}
55-
images {
56-
image: "/assets/images/enemyBlack1.png"
57-
}
58-
images {
59-
image: "/assets/images/lighting_blue.png"
60-
}
61-
images {
62-
image: "/assets/images/particle_brown.png"
63-
}
64-
images {
65-
image: "/assets/images/crosshair010.png"
66-
}
67-
images {
68-
image: "/assets/images/bar_round_large_grey.png"
69-
}
70-
images {
71-
image: "/assets/images/bar_round_large_red.png"
72-
}
73-
animations {
74-
id: "coin"
75-
images {
76-
image: "/assets/images/coin/dcoin_1.png"
77-
}
78-
images {
79-
image: "/assets/images/coin/dcoin_2.png"
80-
}
81-
images {
82-
image: "/assets/images/coin/dcoin_3.png"
83-
}
84-
images {
85-
image: "/assets/images/coin/dcoin_4.png"
86-
}
87-
images {
88-
image: "/assets/images/coin/dcoin_5.png"
89-
}
90-
playback: PLAYBACK_LOOP_FORWARD
91-
fps: 8
92-
}
934
extrude_borders: 2

sound/music/example/music.collection

+8-75
Original file line numberDiff line numberDiff line change
@@ -5,130 +5,63 @@ embedded_instances {
55
data: "components {\n"
66
" id: \"script\"\n"
77
" component: \"/example/music.script\"\n"
8-
" position {\n"
9-
" x: 0.0\n"
10-
" y: 0.0\n"
11-
" z: 0.0\n"
12-
" }\n"
13-
" rotation {\n"
14-
" x: 0.0\n"
15-
" y: 0.0\n"
16-
" z: 0.0\n"
17-
" w: 1.0\n"
18-
" }\n"
198
"}\n"
209
"embedded_components {\n"
2110
" id: \"sprite\"\n"
2211
" type: \"sprite\"\n"
23-
" data: \"tile_set: \\\"/assets/sprites.atlas\\\"\\n"
24-
"default_animation: \\\"bunny2_ready\\\"\\n"
12+
" data: \"default_animation: \\\"shipGreen_manned\\\"\\n"
2513
"material: \\\"/builtins/materials/sprite.material\\\"\\n"
26-
"blend_mode: BLEND_MODE_ALPHA\\n"
14+
"textures {\\n"
15+
" sampler: \\\"texture_sampler\\\"\\n"
16+
" texture: \\\"/assets/sprites.atlas\\\"\\n"
17+
"}\\n"
2718
"\"\n"
28-
" position {\n"
29-
" x: 0.0\n"
30-
" y: 0.0\n"
31-
" z: 0.0\n"
32-
" }\n"
33-
" rotation {\n"
34-
" x: 0.0\n"
35-
" y: 0.0\n"
36-
" z: 0.0\n"
37-
" w: 1.0\n"
38-
" }\n"
3919
"}\n"
4020
"embedded_components {\n"
4121
" id: \"label\"\n"
4222
" type: \"label\"\n"
4323
" data: \"size {\\n"
4424
" x: 128.0\\n"
4525
" y: 32.0\\n"
46-
" z: 0.0\\n"
47-
" w: 0.0\\n"
48-
"}\\n"
49-
"scale {\\n"
50-
" x: 0.5\\n"
51-
" y: 0.5\\n"
52-
" z: 1.0\\n"
53-
" w: 0.0\\n"
5426
"}\\n"
5527
"color {\\n"
5628
" x: 0.0\\n"
5729
" y: 0.5647059\\n"
5830
" z: 0.99215686\\n"
59-
" w: 1.0\\n"
6031
"}\\n"
6132
"outline {\\n"
6233
" x: 1.0\\n"
6334
" y: 1.0\\n"
6435
" z: 1.0\\n"
65-
" w: 1.0\\n"
6636
"}\\n"
6737
"shadow {\\n"
6838
" x: 1.0\\n"
6939
" y: 1.0\\n"
7040
" z: 1.0\\n"
71-
" w: 1.0\\n"
7241
"}\\n"
73-
"leading: 1.0\\n"
74-
"tracking: 0.0\\n"
75-
"pivot: PIVOT_CENTER\\n"
76-
"blend_mode: BLEND_MODE_ALPHA\\n"
77-
"line_break: false\\n"
7842
"text: \\\"Dig the tune...\\\"\\n"
7943
"font: \\\"/assets/text48.font\\\"\\n"
8044
"material: \\\"/builtins/fonts/label.material\\\"\\n"
8145
"\"\n"
8246
" position {\n"
8347
" x: 84.84\n"
8448
" y: 118.002\n"
85-
" z: 0.0\n"
8649
" }\n"
87-
" rotation {\n"
88-
" x: 0.0\n"
89-
" y: 0.0\n"
90-
" z: 0.0\n"
91-
" w: 1.0\n"
50+
" scale {\n"
51+
" x: 0.5\n"
52+
" y: 0.5\n"
9253
" }\n"
9354
"}\n"
9455
"embedded_components {\n"
9556
" id: \"music\"\n"
9657
" type: \"sound\"\n"
9758
" data: \"sound: \\\"/example/bunny_tears.ogg\\\"\\n"
9859
"looping: 1\\n"
99-
"group: \\\"master\\\"\\n"
100-
"gain: 1.0\\n"
101-
"pan: 0.0\\n"
102-
"speed: 1.0\\n"
103-
"loopcount: 0\\n"
10460
"\"\n"
105-
" position {\n"
106-
" x: 0.0\n"
107-
" y: 0.0\n"
108-
" z: 0.0\n"
109-
" }\n"
110-
" rotation {\n"
111-
" x: 0.0\n"
112-
" y: 0.0\n"
113-
" z: 0.0\n"
114-
" w: 1.0\n"
115-
" }\n"
11661
"}\n"
11762
""
11863
position {
11964
x: 335.192
12065
y: 316.802
121-
z: 0.0
122-
}
123-
rotation {
124-
x: 0.0
125-
y: 0.0
126-
z: 0.0
127-
w: 1.0
128-
}
129-
scale3 {
130-
x: 1.0
131-
y: 1.0
132-
z: 1.0
13366
}
13467
}

sound/music/example/music.jpg

-41 KB
Binary file not shown.

sound/music/music.png

133 KB

0 commit comments

Comments
 (0)