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 14:01:17 +03:00
parent dc84869464
commit d40cf52ee9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/voxelworld/voxelworld.cpp
View File

@ -93,7 +93,7 @@ static inline int container_coord(int x, int d)
return (x>=0 ? x : x-d+1) / d; return (x>=0 ? x : x-d+1) / d;
} }
static inline pv::Vector3DInt32 container_coord( static inline pv::Vector3DInt32 container_coord(
const pv::Vector3DInt32 &p, const pv::Vector3DInt32 &d) const pv::Vector3DInt32 &p, const pv::Vector3DInt32 &d)
{ {
return pv::Vector3DInt32( return pv::Vector3DInt32(
container_coord(p.getX(), d.getX()), container_coord(p.getX(), d.getX()),
@ -101,7 +101,7 @@ static inline pv::Vector3DInt32 container_coord(
container_coord(p.getZ(), d.getZ())); container_coord(p.getZ(), d.getZ()));
} }
static inline pv::Vector3DInt32 container_coord( static inline pv::Vector3DInt32 container_coord(
const pv::Vector3DInt32 &p, const pv::Vector3DInt16 &d) const pv::Vector3DInt32 &p, const pv::Vector3DInt16 &d)
{ {
return pv::Vector3DInt32( return pv::Vector3DInt32(
container_coord(p.getX(), d.getX()), container_coord(p.getX(), d.getX()),
@ -109,7 +109,7 @@ static inline pv::Vector3DInt32 container_coord(
container_coord(p.getZ(), d.getZ())); container_coord(p.getZ(), d.getZ()));
} }
static inline pv::Vector3DInt16 container_coord16( static inline pv::Vector3DInt16 container_coord16(
const pv::Vector3DInt32 &p, const pv::Vector3DInt16 &d) const pv::Vector3DInt32 &p, const pv::Vector3DInt16 &d)
{ {
return pv::Vector3DInt16( return pv::Vector3DInt16(
container_coord(p.getX(), d.getX()), container_coord(p.getX(), d.getX()),

6
src/impl/mesh.cpp
View File

@ -215,7 +215,7 @@ Model* create_voxel_physics_model(Context *context,
IsQuadNeededByRegistryPhysics<VoxelInstance> iqn(voxel_reg); IsQuadNeededByRegistryPhysics<VoxelInstance> iqn(voxel_reg);
pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh; pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh;
pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>, pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>,
IsQuadNeededByRegistryPhysics<VoxelInstance>> IsQuadNeededByRegistryPhysics<VoxelInstance>>
surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn); surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn);
surfaceExtractor.execute(); surfaceExtractor.execute();
@ -430,7 +430,7 @@ void set_voxel_geometry(CustomGeometry *cg, Context *context,
IsQuadNeededByRegistry<VoxelInstance> iqn(voxel_reg, atlas_reg); IsQuadNeededByRegistry<VoxelInstance> iqn(voxel_reg, atlas_reg);
pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh; pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh;
pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>, pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>,
IsQuadNeededByRegistry<VoxelInstance>> IsQuadNeededByRegistry<VoxelInstance>>
surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn); surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn);
surfaceExtractor.execute(); surfaceExtractor.execute();
@ -641,7 +641,7 @@ void set_voxel_lod_geometry(int lod, CustomGeometry *cg, Context *context,
IsQuadNeededByRegistry<VoxelInstance> iqn(voxel_reg, atlas_reg); IsQuadNeededByRegistry<VoxelInstance> iqn(voxel_reg, atlas_reg);
pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh; pv::SurfaceMesh<pv::PositionMaterialNormal> pv_mesh;
pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>, pv::CubicSurfaceExtractorWithNormals<pv::RawVolume<VoxelInstance>,
IsQuadNeededByRegistry<VoxelInstance>> IsQuadNeededByRegistry<VoxelInstance>>
surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn); surfaceExtractor(&volume, volume.getEnclosingRegion(), &pv_mesh, iqn);
surfaceExtractor.execute(); surfaceExtractor.execute();