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

Break coding style

Browse Source
This commit is contained in:
Perttu Ahola 2014-10-27 01:07:05 +02:00
parent 8c864c6ac9
commit b50656f505
15 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/ground_plane_lighting/ground_plane_lighting.cpp
View File

@ -283,7 +283,8 @@ struct Module: public interface::Module, public ground_plane_lighting::Interface
{ {
interface::VoxelRegistry *voxel_reg = ivoxelworld->get_voxel_reg(); interface::VoxelRegistry *voxel_reg = ivoxelworld->get_voxel_reg();
//const auto &chunk_size_voxels = ivoxelworld->get_chunk_size_voxels(); //const auto &chunk_size_voxels = ivoxelworld->get_chunk_size_voxels();
pv::Region chunk_region = ivoxelworld->get_chunk_region_voxels(chunk_p); pv::Region chunk_region =
ivoxelworld->get_chunk_region_voxels(chunk_p);
ground_plane_lighting::access(m_server, ground_plane_lighting::access(m_server,
[&](ground_plane_lighting::Interface *igpl) [&](ground_plane_lighting::Interface *igpl)

2
builtin/main_context/api.h
View File

@ -40,6 +40,4 @@ namespace main_context
}); });
} }
} }
// vim: set noet ts=4 sw=4: // vim: set noet ts=4 sw=4:

4
builtin/main_context/main_context.cpp
View File

@ -61,8 +61,8 @@ struct Module: public interface::Module, public main_context::Interface
magic::SharedPtr<magic::Context> m_context; magic::SharedPtr<magic::Context> m_context;
magic::SharedPtr<magic::Engine> m_engine; magic::SharedPtr<magic::Engine> m_engine;
magic::SharedPtr<magic::Scene> m_scene; magic::SharedPtr<magic::Scene> m_scene;
sm_<Event::Type, magic::SharedPtr<interface::MagicEventHandler>> sm_<Event::Type, magic::SharedPtr<interface::MagicEventHandler>
m_magic_event_handlers; > m_magic_event_handlers;
uint64_t profiler_last_print_us = 0; uint64_t profiler_last_print_us = 0;

4
src/impl/mesh.cpp
View File

@ -844,6 +844,10 @@ void generate_voxel_physics_boxes(
if(!def) if(!def)
throw Exception(ss_()+"Undefined voxel: "+itos(v_orig.get_id())); throw Exception(ss_()+"Undefined voxel: "+itos(v_orig.get_id()));
uint8_t v = (def && def->physically_solid); uint8_t v = (def && def->physically_solid);
volume.setVoxelAt(x, y, z, v); volume.setVoxelAt(x, y, z, v);
} }

1
src/interface/magic_event_handler.h
View File

@ -70,3 +70,4 @@ namespace interface
} }
}; };
} }
// vim: set noet ts=4 sw=4:

1
src/interface/server_config.h
View File

@ -9,4 +9,3 @@ namespace interface
typedef server::Config ServerConfig; typedef server::Config ServerConfig;
} }
// vim: set noet ts=4 sw=4: // vim: set noet ts=4 sw=4:

1
src/server/rccpp_util.cpp
View File

@ -70,3 +70,4 @@ ss_ hash_files(const sv_<ss_> &paths)
} }
} }
// vim: set noet ts=4 sw=4:

4
src/server/urho3d_log_redirect.h
View File

@ -42,7 +42,8 @@ namespace urho3d_log_redirect
void on_message(const interface::MagicEvent &event) void on_message(const interface::MagicEvent &event)
{ {
int magic_level = event.magic_data.Find("Level")->second_.GetInt(); int magic_level = event.magic_data.Find("Level")->second_.GetInt();
ss_ message = event.magic_data.Find("Message")->second_.GetString().CString(); ss_ message =
event.magic_data.Find("Message")->second_.GetString().CString();
int core_level = LOG_ERROR; int core_level = LOG_ERROR;
if(magic_level == magic::LOG_DEBUG) if(magic_level == magic::LOG_DEBUG)
core_level = LOG_DEBUG; core_level = LOG_DEBUG;
@ -56,3 +57,4 @@ namespace urho3d_log_redirect
} }
}; };
} // urho3d_log_redirect } // urho3d_log_redirect
// vim: set noet ts=4 sw=4: