update builtins materials

defold · Mar 18, 2024 · 2186a6b · 2186a6b
1 parent 5a144c1
commit 2186a6b
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 15 deletions.
diff --git a/engine/engine/content/builtins/materials/gui.material b/engine/engine/content/builtins/materials/gui.material
@@ -1,8 +1,10 @@
 name: "gui"
+tags: "gui"
 vertex_program: "/builtins/materials/gui.vp"
 fragment_program: "/builtins/materials/gui.fp"
-tags: "gui"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
 }
+max_page_count: 0
diff --git a/engine/engine/content/builtins/materials/model.material b/engine/engine/content/builtins/materials/model.material
@@ -1,5 +1,5 @@
 name: "model"
-tags: "model" 
+tags: "model"
 vertex_program: "/builtins/materials/model.vp"
 fragment_program: "/builtins/materials/model.fp"
 vertex_space: VERTEX_SPACE_LOCAL
@@ -39,4 +39,12 @@ fragment_constants {
     w: 1.0
   }
 }
-textures: "tex0"
+samplers {
+  name: "tex0"
+  wrap_u: WRAP_MODE_CLAMP_TO_EDGE
+  wrap_v: WRAP_MODE_CLAMP_TO_EDGE
+  filter_min: FILTER_MODE_MIN_LINEAR
+  filter_mag: FILTER_MODE_MAG_LINEAR
+  max_anisotropy: 1.0
+}
+max_page_count: 0
diff --git a/engine/engine/content/builtins/materials/particlefx.material b/engine/engine/content/builtins/materials/particlefx.material
@@ -1,13 +1,20 @@
 name: "particle"
+tags: "particle"
 vertex_program: "/builtins/materials/particlefx.vp"
 fragment_program: "/builtins/materials/particlefx.fp"
-tags: "particle"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
 }
 fragment_constants {
   name: "tint"
   type: CONSTANT_TYPE_USER
-  value: {x: 1 y: 1 z: 1 w: 1}
+  value {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
 }
+max_page_count: 0
diff --git a/engine/engine/content/builtins/materials/particlefx_paged_atlas.material b/engine/engine/content/builtins/materials/particlefx_paged_atlas.material
@@ -1,14 +1,20 @@
 name: "particle_paged_atlas"
+tags: "particle"
 vertex_program: "/builtins/materials/particlefx_paged_atlas.vp"
 fragment_program: "/builtins/materials/particlefx_paged_atlas.fp"
-tags: "particle"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
 }
 fragment_constants {
   name: "tint"
   type: CONSTANT_TYPE_USER
-  value: {x: 1 y: 1 z: 1 w: 1}
+  value {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
 }
 max_page_count: 4
diff --git a/engine/engine/content/builtins/materials/sprite.material b/engine/engine/content/builtins/materials/sprite.material
@@ -1,15 +1,21 @@
 name: "sprite"
+tags: "tile"
 vertex_program: "/builtins/materials/sprite.vp"
 fragment_program: "/builtins/materials/sprite.fp"
-tags: "tile"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
 }
 fragment_constants {
   name: "tint"
   type: CONSTANT_TYPE_USER
-  value: {x: 1 y: 1 z: 1 w: 1}
+  value {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
 }
 samplers {
   name: "texture_sampler"
@@ -18,4 +24,5 @@ samplers {
   filter_min: FILTER_MODE_MIN_DEFAULT
   filter_mag: FILTER_MODE_MAG_DEFAULT
   max_anisotropy: 1.0
-}
+}
+max_page_count: 0
diff --git a/engine/engine/content/builtins/materials/sprite_paged_atlas.material b/engine/engine/content/builtins/materials/sprite_paged_atlas.material
@@ -1,17 +1,22 @@
 name: "sprite_paged_atlas"
+tags: "tile"
 vertex_program: "/builtins/materials/sprite_paged_atlas.vp"
 fragment_program: "/builtins/materials/sprite_paged_atlas.fp"
-tags: "tile"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
 }
 fragment_constants {
   name: "tint"
   type: CONSTANT_TYPE_USER
-  value: {x: 1 y: 1 z: 1 w: 1}
+  value {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
 }
-max_page_count: 4
 samplers {
   name: "texture_sampler"
   wrap_u: WRAP_MODE_CLAMP_TO_EDGE
@@ -20,3 +25,4 @@ samplers {
   filter_mag: FILTER_MODE_MAG_DEFAULT
   max_anisotropy: 1.0
 }
+max_page_count: 4
diff --git a/engine/engine/content/builtins/materials/tile_map.material b/engine/engine/content/builtins/materials/tile_map.material
@@ -1,7 +1,8 @@
 name: "tile_map"
+tags: "tile"
 vertex_program: "/builtins/materials/tile_map.vp"
 fragment_program: "/builtins/materials/tile_map.fp"
-tags: "tile"
+vertex_space: VERTEX_SPACE_WORLD
 vertex_constants {
   name: "view_proj"
   type: CONSTANT_TYPE_VIEWPROJ
@@ -13,5 +14,11 @@ vertex_constants {
 fragment_constants {
   name: "tint"
   type: CONSTANT_TYPE_USER
-  value: {x: 1 y: 1 z: 1 w: 1}
+  value {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
 }
+max_page_count: 0