celeron55/buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/voxelworld: Move world region to be decided by caller

Browse Source
This commit is contained in:
Perttu Ahola 2014-10-29 19:13:09 +02:00
parent 55900afc77
commit 8244bac731
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/voxelworld/api.h
View File

@ -106,7 +106,8 @@ namespace voxelworld
struct Interface
{
virtual void create_instance(SceneReference scene_ref) = 0;
virtual void create_instance(SceneReference scene_ref,
const pv::Region &region) = 0;
virtual void delete_instance(SceneReference scene_ref) = 0;
virtual Instance* get_instance(SceneReference scene_ref) = 0;

16
builtin/voxelworld/voxelworld.cpp
View File

@ -252,7 +252,8 @@ struct CInstance: public voxelworld::Instance
// (as a sorted array in descending node_id order)
std::vector<QueuedNodePhysicsUpdate> m_nodes_needing_physics_update;
CInstance(interface::Server *server, SceneReference scene_ref):
CInstance(interface::Server *server, SceneReference scene_ref,
const pv::Region &region):
m_server(server),
m_scene_ref(scene_ref)
{
@ -267,15 +268,6 @@ struct CInstance: public voxelworld::Instance
// TODO: Load from disk or something
//pv::Region region(0, 0, 0, 0, 0, 0); // Use this for valgrind
//pv::Region region(-1, 0, -1, 1, 0, 1);
//pv::Region region(-1, -1, -1, 1, 1, 1);
//pv::Region region(-2, -1, -2, 2, 1, 2);
//pv::Region region(-3, -1, -3, 3, 1, 3);
pv::Region region(-5, -1, 0, 0, 1, 5);
//pv::Region region(-5, -1, -5, 5, 1, 5);
//pv::Region region(-6, -1, -6, 6, 1, 6);
//pv::Region region(-8, -1, -8, 8, 1, 8);
auto lc = region.getLowerCorner();
auto uc = region.getUpperCorner();
for(int z = lc.getZ(); z <= uc.getZ(); z++){
@ -1197,7 +1189,7 @@ struct Module: public interface::Module, public voxelworld::Interface
// Interface
void create_instance(SceneReference scene_ref)
void create_instance(SceneReference scene_ref, const pv::Region &region)
{
auto it = m_instances.find(scene_ref);
// TODO: Is an exception the best way to handle this?
@ -1205,7 +1197,7 @@ struct Module: public interface::Module, public voxelworld::Interface
throw Exception("create_instance(): Scene already has a voxel"
" world instance");
up_<CInstance> instance(new CInstance(m_server, scene_ref));
up_<CInstance> instance(new CInstance(m_server, scene_ref, region));
m_instances[scene_ref] = std::move(instance);
}

11
games/digger/main/main.cpp
View File

@ -237,7 +237,16 @@ struct Module: public interface::Module
voxelworld::access(m_server, [&](voxelworld::Interface *ivoxelworld)
{
ivoxelworld->create_instance(m_main_scene);
//pv::Region region(0, 0, 0, 0, 0, 0); // Use this for valgrind
//pv::Region region(-1, 0, -1, 1, 0, 1);
//pv::Region region(-1, -1, -1, 1, 1, 1);
//pv::Region region(-2, -1, -2, 2, 1, 2);
//pv::Region region(-3, -1, -3, 3, 1, 3);
pv::Region region(-5, -1, 0, 0, 1, 5);
//pv::Region region(-5, -1, -5, 5, 1, 5);
//pv::Region region(-6, -1, -6, 6, 1, 6);
//pv::Region region(-8, -1, -8, 8, 1, 8);
ivoxelworld->create_instance(m_main_scene, region);
});
ground_plane_lighting::access(m_server,