Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Apply clang-format to code base

Browse source
This commit is contained in:
clang-format-bot 2022-09-22 21:26:05 +03:00 • committed by ζeh Matt
parent f37d0be806
commit ddb0522bbf
No known key found for this signature in database
GPG key ID: 18CE582C71A225B0
2199 changed files with 118692 additions and 114392 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/sceneutil/waterutil.cpp
View file

@ -12,24 +12,24 @@ namespace SceneUtil
// disable nonsense test against a worldsize bb what will always pass
class WaterBoundCallback : public osg::Drawable::ComputeBoundingBoxCallback
{
osg::BoundingBox computeBound(const osg::Drawable&) const override { return osg::BoundingBox(); }
osg::BoundingBox computeBound(const osg::Drawable&) const override { return osg::BoundingBox(); }
};
osg::ref_ptr<osg::Geometry> createWaterGeometry(float size, int segments, float textureRepeats)
{
osg::ref_ptr<osg::Vec3Array> verts (new osg::Vec3Array);
osg::ref_ptr<osg::Vec2Array> texcoords (new osg::Vec2Array);
osg::ref_ptr<osg::Vec3Array> verts(new osg::Vec3Array);
osg::ref_ptr<osg::Vec2Array> texcoords(new osg::Vec2Array);
// some drivers don't like huge triangles, so we do some subdivisons
// a paged solution would be even better
const float step = size/segments;
const float step = size / segments;
const float texCoordStep = textureRepeats / segments;
for (int x=0; x<segments; ++x)
for (int x = 0; x < segments; ++x)
{
for (int y=0; y<segments; ++y)
for (int y = 0; y < segments; ++y)
{
float x1 = -size/2.f + x*step;
float y1 = -size/2.f + y*step;
float x1 = -size / 2.f + x * step;
float y1 = -size / 2.f + y * step;
float x2 = x1 + step;
float y2 = y1 + step;
@ -38,8 +38,8 @@ namespace SceneUtil
verts->push_back(osg::Vec3f(x2, y1, 0.f));
verts->push_back(osg::Vec3f(x2, y2, 0.f));
float u1 = x*texCoordStep;
float v1 = y*texCoordStep;
float u1 = x * texCoordStep;
float v1 = y * texCoordStep;
float u2 = u1 + texCoordStep;
float v2 = v1 + texCoordStep;
@ -50,15 +50,15 @@ namespace SceneUtil
}
}
osg::ref_ptr<osg::Geometry> waterGeom (new osg::Geometry);
osg::ref_ptr<osg::Geometry> waterGeom(new osg::Geometry);
waterGeom->setVertexArray(verts);
waterGeom->setTexCoordArray(0, texcoords);
osg::ref_ptr<osg::Vec3Array> normal (new osg::Vec3Array);
normal->push_back(osg::Vec3f(0,0,1));
osg::ref_ptr<osg::Vec3Array> normal(new osg::Vec3Array);
normal->push_back(osg::Vec3f(0, 0, 1));
waterGeom->setNormalArray(normal, osg::Array::BIND_OVERALL);
waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS,0,verts->size()));
waterGeom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::QUADS, 0, verts->size()));
waterGeom->setComputeBoundingBoxCallback(new WaterBoundCallback);
waterGeom->setCullingActive(false);
return waterGeom;
@ -66,9 +66,9 @@ namespace SceneUtil
osg::ref_ptr<osg::StateSet> createSimpleWaterStateSet(float alpha, int renderBin)
{
osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
osg::ref_ptr<osg::StateSet> stateset(new osg::StateSet);
osg::ref_ptr<osg::Material> material (new osg::Material);
osg::ref_ptr<osg::Material> material(new osg::Material);
material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f, 0.f, 0.f, 1.f));
material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, alpha));
material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1.f, 1.f, 1.f, 1.f));