mirror of
https://github.com/Relintai/props_2d.git
synced 2024-11-14 10:27:17 +01:00
Re-implement material support in TiledWall2D.
This commit is contained in:
parent
40f65c843f
commit
11ead96592
@ -139,9 +139,10 @@ void TiledWall2D::refresh() {
|
|||||||
_cache->mutex_unlock();
|
_cache->mutex_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
//canvas_item_set_material TODO (use canvas item's property)
|
Ref<Material> mat = _cache->material_get();
|
||||||
//Remove material arrays, only have one optional
|
if (mat != get_material()) {
|
||||||
//Add tile widht, height
|
set_material(mat);
|
||||||
|
}
|
||||||
|
|
||||||
Ref<Texture> tex = _cache->texture_get_merged();
|
Ref<Texture> tex = _cache->texture_get_merged();
|
||||||
|
|
||||||
@ -192,12 +193,6 @@ void TiledWall2D::generate_mesh() {
|
|||||||
|
|
||||||
VisualServer::get_singleton()->mesh_add_surface_from_arrays(_mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, _mesh_array);
|
VisualServer::get_singleton()->mesh_add_surface_from_arrays(_mesh_rid, VisualServer::PRIMITIVE_TRIANGLES, _mesh_array);
|
||||||
|
|
||||||
//Ref<Material> material = _cache->material_lod_get(0);
|
|
||||||
|
|
||||||
//if (material.is_valid()) {
|
|
||||||
// VisualServer::get_singleton()->mesh_surface_set_material(_mesh_rid, 0, material->get_rid());
|
|
||||||
//}
|
|
||||||
|
|
||||||
_aabb.size = Vector3(_width, _height, 0);
|
_aabb.size = Vector3(_width, _height, 0);
|
||||||
|
|
||||||
update();
|
update();
|
||||||
|
Loading…
Reference in New Issue
Block a user