Daniele Bartolini 10 年 前
コミット
540116b446
4 ファイル変更4 行追加4 行削除
  1. 1 1
      docs/lua_api.txt
  2. 1 1
      src/lua/lua_api.cpp
  3. 1 1
      src/resource/unit_compiler.cpp
  4. 1 1
      src/world/render_world.cpp

+ 1 - 1
docs/lua_api.txt

@@ -507,7 +507,7 @@ RenderWorld
 Mesh
 ----
 
-	**create_mesh** (rw, unit, mesh_resource, mesh_name, material_resource, visible) : Id
+	**create_mesh** (rw, unit, mesh_resource, geometry_name, material_resource, visible) : Id
 		Creates a new mesh instance for *unit* and returns its id.
 
 	**destroy_mesh** (rw, id)

+ 1 - 1
src/lua/lua_api.cpp

@@ -1651,7 +1651,7 @@ static int render_world_create_mesh(lua_State* L)
 
 	MeshRendererDesc desc;
 	desc.mesh_resource = stack.get_resource_id(3);
-	desc.mesh_name = stack.get_string_id_32(4);
+	desc.geometry_name = stack.get_string_id_32(4);
 	desc.material_resource = stack.get_resource_id(5);
 	desc.visible = stack.get_bool(6);
 

+ 1 - 1
src/resource/unit_compiler.cpp

@@ -118,7 +118,7 @@ static Buffer compile_mesh_renderer(const char* json, CompileOptions& opts)
 
 	MeshRendererDesc mrd;
 	mrd.mesh_resource     = sjson::parse_resource_id(obj["mesh_resource"]);
-	mrd.mesh_name         = sjson::parse_string_id  (obj["mesh_name"]);
+	mrd.geometry_name     = sjson::parse_string_id  (obj["mesh_name"]);
 	mrd.material_resource = sjson::parse_resource_id(obj["material"]);
 	mrd.visible           = sjson::parse_bool       (obj["visible"]);
 

+ 1 - 1
src/world/render_world.cpp

@@ -56,7 +56,7 @@ MeshInstance RenderWorld::create_mesh(UnitId id, const MeshRendererDesc& mrd, co
 		grow_mesh();
 
 	const MeshResource* mr = (const MeshResource*)_resource_manager->get(MESH_TYPE, mrd.mesh_resource);
-	const MeshGeometry* mg = mr->geometry(mrd.mesh_name);
+	const MeshGeometry* mg = mr->geometry(mrd.geometry_name);
 
 	_material_manager->create_material(mrd.material_resource);