Browse Source

Fixed materials

Björn Ritzl 1 month ago
parent
commit
31cfe24382

+ 0 - 47
model/character/assets/materials/model_local.material

@@ -1,47 +0,0 @@
-name: "model"
-tags: "model"
-vertex_program: "/builtins/materials/model.vp"
-fragment_program: "/builtins/materials/model.fp"
-vertex_constants {
-  name: "mtx_worldview"
-  type: CONSTANT_TYPE_WORLDVIEW
-}
-vertex_constants {
-  name: "mtx_view"
-  type: CONSTANT_TYPE_VIEW
-}
-vertex_constants {
-  name: "mtx_proj"
-  type: CONSTANT_TYPE_PROJECTION
-}
-vertex_constants {
-  name: "mtx_normal"
-  type: CONSTANT_TYPE_NORMAL
-}
-vertex_constants {
-  name: "light"
-  type: CONSTANT_TYPE_USER
-  value {
-    x: 1.0
-    y: 1.0
-    z: 10.0
-    w: 1.0
-  }
-}
-fragment_constants {
-  name: "tint"
-  type: CONSTANT_TYPE_USER
-  value {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-}
-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
-}

+ 2 - 2
model/character/example/example.collection

@@ -58,7 +58,7 @@ embedded_instances {
   "name: \\\"{{NAME}}\\\"\\n"
   "name: \\\"{{NAME}}\\\"\\n"
   "materials {\\n"
   "materials {\\n"
   "  name: \\\"knight_texture\\\"\\n"
   "  name: \\\"knight_texture\\\"\\n"
-  "  material: \\\"/assets/materials/model_local.material\\\"\\n"
+  "  material: \\\"/builtins/materials/model_skinned.material\\\"\\n"
   "  textures {\\n"
   "  textures {\\n"
   "    sampler: \\\"tex0\\\"\\n"
   "    sampler: \\\"tex0\\\"\\n"
   "    texture: \\\"/assets/models/knight_texture.png\\\"\\n"
   "    texture: \\\"/assets/models/knight_texture.png\\\"\\n"
@@ -66,7 +66,7 @@ embedded_instances {
   "}\\n"
   "}\\n"
   "materials {\\n"
   "materials {\\n"
   "  name: \\\"knight_texture_no_skin\\\"\\n"
   "  name: \\\"knight_texture_no_skin\\\"\\n"
-  "  material: \\\"/assets/materials/model_local.material\\\"\\n"
+  "  material: \\\"/builtins/materials/model.material\\\"\\n"
   "  textures {\\n"
   "  textures {\\n"
   "    sampler: \\\"tex0\\\"\\n"
   "    sampler: \\\"tex0\\\"\\n"
   "    texture: \\\"/assets/models/knight_texture.png\\\"\\n"
   "    texture: \\\"/assets/models/knight_texture.png\\\"\\n"