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

Fix coding style

Browse Source
This commit is contained in:
Perttu Ahola 2014-10-17 13:49:55 +03:00
parent ad528c2443
commit f64adf35d6
46 changed files with 292 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/voxelworld/voxelworld.cpp
View File

@ -222,7 +222,8 @@ ChunkBuffer& Section::get_buffer(const pv::Vector3DInt32 &chunk_p,
{ {
Node *n = scene->GetNode(node_id); Node *n = scene->GetNode(node_id);
if(!n){ if(!n){
log_w("voxelworld", "Section::get_buffer(): Node %i not found in scene " log_w("voxelworld",
"Section::get_buffer(): Node %i not found in scene "
"for chunk " PV3I_FORMAT " in section " PV3I_FORMAT, "for chunk " PV3I_FORMAT " in section " PV3I_FORMAT,
node_id, PV3I_PARAMS(chunk_p), PV3I_PARAMS(section_p)); node_id, PV3I_PARAMS(chunk_p), PV3I_PARAMS(section_p));
return; return;
@ -234,7 +235,8 @@ ChunkBuffer& Section::get_buffer(const pv::Vector3DInt32 &chunk_p,
interface::deserialize_volume(data); interface::deserialize_volume(data);
buf.volume = sp_<pv::RawVolume<VoxelInstance>>(std::move(volume)); buf.volume = sp_<pv::RawVolume<VoxelInstance>>(std::move(volume));
if(!buf.volume){ if(!buf.volume){
log_w("voxelworld", "Section::get_buffer(): Voxel volume could not be " log_w("voxelworld",
"Section::get_buffer(): Voxel volume could not be "
"loaded from node %i for chunk " "loaded from node %i for chunk "
PV3I_FORMAT " in section " PV3I_FORMAT, PV3I_FORMAT " in section " PV3I_FORMAT,
node_id, PV3I_PARAMS(chunk_p), PV3I_PARAMS(section_p)); node_id, PV3I_PARAMS(chunk_p), PV3I_PARAMS(section_p));

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

@ -118,7 +118,8 @@ struct Module: public interface::Module
voxelworld::access(m_server, [&](voxelworld::Interface *ivoxelworld) voxelworld::access(m_server, [&](voxelworld::Interface *ivoxelworld)
{ {
interface::VoxelRegistry *voxel_reg = ivoxelworld->get_voxel_reg(); interface::VoxelRegistry *voxel_reg =
ivoxelworld->get_voxel_reg();
Node *n = scene->CreateChild("Testbox"); Node *n = scene->CreateChild("Testbox");
n->SetPosition(Vector3(30.0f, 30.0f, 40.0f)); n->SetPosition(Vector3(30.0f, 30.0f, 40.0f));
@ -152,7 +153,8 @@ struct Module: public interface::Module
RigidBody *body = n->CreateComponent<RigidBody>(LOCAL); RigidBody *body = n->CreateComponent<RigidBody>(LOCAL);
body->SetFriction(0.75f); body->SetFriction(0.75f);
body->SetMass(1.0); body->SetMass(1.0);
CollisionShape *shape = n->CreateComponent<CollisionShape>(LOCAL); CollisionShape *shape =
n->CreateComponent<CollisionShape>(LOCAL);
shape->SetConvexHull(model, 0, Vector3::ONE); shape->SetConvexHull(model, 0, Vector3::ONE);
//shape->SetTriangleMesh(model, 0, Vector3::ONE); //shape->SetTriangleMesh(model, 0, Vector3::ONE);
//shape->SetBox(Vector3::ONE); //shape->SetBox(Vector3::ONE);
@ -201,7 +203,8 @@ struct Module: public interface::Module
voxelworld::access(m_server, [&](voxelworld::Interface *ivoxelworld) voxelworld::access(m_server, [&](voxelworld::Interface *ivoxelworld)
{ {
const pv::Vector3DInt16 &section_p = event.section_p; const pv::Vector3DInt16 &section_p = event.section_p;
pv::Region region = ivoxelworld->get_section_region_voxels(section_p); pv::Region region = ivoxelworld->get_section_region_voxels(
section_p);
pv::Vector3DInt32 p0 = region.getLowerCorner(); pv::Vector3DInt32 p0 = region.getLowerCorner();
pv::Vector3DInt32 p1 = region.getUpperCorner(); pv::Vector3DInt32 p1 = region.getUpperCorner();

6
src/impl/voxel_volume.cpp
View File

@ -27,7 +27,7 @@ ss_ serialize_volume_simple(const pv::RawVolume<VoxelInstance> &volume)
} }
} }
return os.str(); return os.str();
}; }
ss_ serialize_volume_compressed(const pv::RawVolume<VoxelInstance> &volume) ss_ serialize_volume_compressed(const pv::RawVolume<VoxelInstance> &volume)
{ {
@ -55,7 +55,7 @@ ss_ serialize_volume_compressed(const pv::RawVolume<VoxelInstance> &volume)
ar(compressed_os.str()); ar(compressed_os.str());
} }
return os.str(); return os.str();
}; }
up_<pv::RawVolume<VoxelInstance>> deserialize_volume(const ss_ &data) up_<pv::RawVolume<VoxelInstance>> deserialize_volume(const ss_ &data)
{ {
@ -102,7 +102,7 @@ up_<pv::RawVolume<VoxelInstance>> deserialize_volume(const ss_ &data)
} }
return volume; return volume;
} }
return up_<pv::RawVolume<VoxelInstance>>();; return up_<pv::RawVolume<VoxelInstance>>();
} }
} }

2
src/lua_bindings/spatial_update_queue.cpp
View File

@ -407,5 +407,5 @@ void init_spatial_update_queue(lua_State *L)
} }
} // namespace lua_bindingss } // namespace lua_bindingss
// vim: set noet ts=4 sw=4:
// vim: set noet ts=4 sw=4: