Skip to content

Commit a311ee4

Browse files
committed
Fixed material paths. Added GUI for billboarding example to explain controls.
1 parent dd54e92 commit a311ee4

13 files changed

Lines changed: 50 additions & 12 deletions

File tree

material/billboarding/assets/foliage/rock1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ embedded_components {
22
id: "sprite"
33
type: "sprite"
44
data: "default_animation: \"rock1\"\n"
5-
"material: \"/main/material/billboard.material\"\n"
5+
"material: \"/example/billboard.material\"\n"
66
"attributes {\n"
77
" name: \"billboard_mode\"\n"
88
" double_values {\n"

material/billboarding/assets/foliage/rock2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ embedded_components {
22
id: "sprite"
33
type: "sprite"
44
data: "default_animation: \"rock2\"\n"
5-
"material: \"/main/material/billboard.material\"\n"
5+
"material: \"/example/billboard.material\"\n"
66
"attributes {\n"
77
" name: \"billboard_mode\"\n"
88
" double_values {\n"

material/billboarding/assets/foliage/tree1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ embedded_components {
22
id: "sprite"
33
type: "sprite"
44
data: "default_animation: \"tree1\"\n"
5-
"material: \"/main/material/billboard.material\"\n"
5+
"material: \"/example/billboard.material\"\n"
66
"attributes {\n"
77
" name: \"billboard_mode\"\n"
88
" double_values {\n"

material/billboarding/assets/foliage/tree2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ embedded_components {
22
id: "sprite"
33
type: "sprite"
44
data: "default_animation: \"tree2\"\n"
5-
"material: \"/main/material/billboard.material\"\n"
5+
"material: \"/example/billboard.material\"\n"
66
"attributes {\n"
77
" name: \"billboard_mode\"\n"
88
" double_values {\n"

material/billboarding/assets/foliage/tree3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ embedded_components {
22
id: "sprite"
33
type: "sprite"
44
data: "default_animation: \"tree3\"\n"
5-
"material: \"/main/material/billboard.material\"\n"
5+
"material: \"/example/billboard.material\"\n"
66
"attributes {\n"
77
" name: \"billboard_mode\"\n"
88
" double_values {\n"

material/billboarding/assets/smoke/smoke.particlefx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ emitters {
77
}
88
tile_source: "/assets/smoke/smoke.atlas"
99
animation: "smoke"
10-
material: "/main/material/billboard.material"
10+
material: "/example/billboard.material"
1111
max_particle_count: 128
1212
type: EMITTER_TYPE_2DCONE
1313
properties {

material/billboarding/example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tags: particlefx, sprite, material, 3d
33
title: Billboarding
44
brief: This example shows how to make sprites and particle sprites face the camera using a custom vertex shader.
55
author: Defold Foundation
6-
scripts: main/material/billboard.vp
6+
scripts: main/billboard.vp
77
thumbnail: thumbnail.png
88
---
99

material/billboarding/main/material/billboard.material renamed to material/billboarding/example/billboard.material

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "billboard"
22
tags: "tile"
3-
vertex_program: "/main/material/billboard.vp"
3+
vertex_program: "/example/billboard.vp"
44
fragment_program: "/builtins/materials/particlefx.fp"
55
vertex_constants {
66
name: "view_proj"
File renamed without changes.

material/billboarding/main/main.collection renamed to material/billboarding/example/main.collection

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ embedded_instances {
453453
id: "particlefx_player"
454454
data: "components {\n"
455455
" id: \"main\"\n"
456-
" component: \"/main/main.script\"\n"
456+
" component: \"/example/main.script\"\n"
457457
"}\n"
458458
""
459459
}
@@ -756,3 +756,11 @@ embedded_instances {
756756
z: 0.84
757757
}
758758
}
759+
embedded_instances {
760+
id: "gui"
761+
data: "components {\n"
762+
" id: \"main\"\n"
763+
" component: \"/example/main.gui\"\n"
764+
"}\n"
765+
""
766+
}

0 commit comments

Comments
 (0)