Skip to content

Commit bbff2f9

Browse files
axmol-botgithub-actions[bot]
authored andcommitted
Committing clang-format changes
1 parent 3b0d163 commit bbff2f9

23 files changed

Lines changed: 123 additions & 117 deletions

File tree

axmol/2d/Label.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,8 +2123,8 @@ void Label::draw(const SceneRenderState& state, const Mat4& transform, uint32_t
21232123
auto visitingCamera = state.getCamera();
21242124
if (visitingCamera)
21252125
{
2126-
_insideBounds = state.requiresVisibilityUpdate(flags) ? state.checkVisibility(transform, _contentSize)
2127-
: _insideBounds;
2126+
_insideBounds =
2127+
state.requiresVisibilityUpdate(flags) ? state.checkVisibility(transform, _contentSize) : _insideBounds;
21282128
}
21292129
else
21302130
{

axmol/2d/NodeGrid.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ void NodeGrid::visit(const SceneRenderState& state, const Mat4& parentTransform,
177177
// canvas ortho matrix. Projecting the uploaded grid vertices/UVs keeps
178178
// tile edges in the same camera space as the captured texture.
179179
const auto& screenProjection = state.getViewProjectionMatrix();
180-
_nodeGrid->setScreenProjectionForBlit(
181-
_projectGridBlitToVisitingCamera ? &screenProjection : nullptr,
182-
_director->getCanvasSize());
180+
_nodeGrid->setScreenProjectionForBlit(_projectGridBlitToVisitingCamera ? &screenProjection : nullptr,
181+
_director->getCanvasSize());
183182
}
184183

185184
// Blit with the grid camera's ortho VP matrix instead of the scene camera's

axmol/2d/ParticleSystemQuad.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,8 @@ void ParticleSystemQuad::draw(const SceneRenderState& state, const Mat4& transfo
665665
ax::Mat4 projectionMat = state.getViewProjectionMatrix();
666666
programState->setUniform(_mvpMatrixLocaiton, projectionMat.m, sizeof(projectionMat.m));
667667

668-
_quadCommand.init(_globalZOrder, _texture, _blendFunc, _quads, _particleCount, transform, flags, state.getView());
668+
_quadCommand.init(_globalZOrder, _texture, _blendFunc, _quads, _particleCount, transform, flags,
669+
state.getView());
669670
state.getRenderer()->addCommand(&_quadCommand);
670671
}
671672
}

axmol/2d/Sprite.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,13 +1084,14 @@ void Sprite::draw(const SceneRenderState& state, const Mat4& transform, uint32_t
10841084
if (visitingCamera == nullptr)
10851085
_insideBounds = true;
10861086
else
1087-
_insideBounds = state.requiresVisibilityUpdate(flags) ? state.checkVisibility(transform, _contentSize)
1088-
: _insideBounds;
1087+
_insideBounds =
1088+
state.requiresVisibilityUpdate(flags) ? state.checkVisibility(transform, _contentSize) : _insideBounds;
10891089

10901090
if (_insideBounds)
10911091
#endif
10921092
{
1093-
_trianglesCommand.init(_globalZOrder, _texture, _blendFunc, _polyInfo.triangles, transform, flags, state.getView());
1093+
_trianglesCommand.init(_globalZOrder, _texture, _blendFunc, _polyInfo.triangles, transform, flags,
1094+
state.getView());
10941095
state.getRenderer()->addCommand(&_trianglesCommand);
10951096

10961097
#if AX_SPRITE_DEBUG_DRAW

axmol/3d/Terrain.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ bool isAABBOutOfViewProjection(const AABB& aabb, const Plane planes[6])
7979
Vec3 point;
8080
for (int i = 0; i < 6; ++i)
8181
{
82-
const auto& plane = planes[i];
82+
const auto& plane = planes[i];
8383
const Vec3& normal = plane.getNormal();
8484
point.x = normal.x < 0 ? aabb._max.x : aabb._min.x;
8585
point.y = normal.y < 0 ? aabb._max.y : aabb._min.y;
@@ -580,11 +580,11 @@ bool Terrain::getIntersectionPoint(const Ray& ray_, Vec3& intersectionPoint) con
580580
ray.transform(getWorldToNodeTransform());
581581

582582
std::set<Chunk*> closeList;
583-
Vec2 start = Vec2(ray.origin.x, ray.origin.z);
584-
Vec2 dir = Vec2(ray.direction.x, ray.direction.z);
583+
Vec2 start = Vec2(ray.origin.x, ray.origin.z);
584+
Vec2 dir = Vec2(ray.direction.x, ray.direction.z);
585585
const float invMapScale = _terrainData._mapScale != 0.0f ? 1.0f / _terrainData._mapScale : 0.0f;
586-
start.x = (start.x + _terrainData._mapScale * _imageWidth * 0.5f) * invMapScale;
587-
start.y = (start.y + _terrainData._mapScale * _imageHeight * 0.5f) * invMapScale;
586+
start.x = (start.x + _terrainData._mapScale * _imageWidth * 0.5f) * invMapScale;
587+
start.y = (start.y + _terrainData._mapScale * _imageHeight * 0.5f) * invMapScale;
588588
start.x /= (_terrainData._chunkSize.width + 1);
589589
start.y /= (_terrainData._chunkSize.height + 1);
590590
Vec2 delta = dir.getNormalized();

axmol/base/InputSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,8 @@ void InputSystem::onPlatformKeyboardWillShow(float rawX, float rawY, float rawWi
740740
keyboardPos = nativeToScreen(keyboardPos);
741741

742742
// Transform the relative screen size vector into World Space dimensions
743-
auto scene = director->getRunningScene();
744-
auto camera = scene ? scene->getDefaultCamera() : nullptr;
743+
auto scene = director->getRunningScene();
744+
auto camera = scene ? scene->getDefaultCamera() : nullptr;
745745
if (!camera)
746746
return ax::Rect();
747747
Vec3 nearWorldSize = camera->deprojectScreenToWorld(Vec3(keyboardSize.x, keyboardSize.y, 0.0f));

axmol/base/PointerEvent.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ void PointerEvent::setPointerInfo(InputPhase phase, Vec2 point, const PointerInp
4848
_pointerId = state.id;
4949
_pressedButtons = state.pressedButtons;
5050

51-
_point = point;
52-
_pressure = state.pressure;
53-
_previousRay = _ray;
54-
_ray = Ray{};
51+
_point = point;
52+
_pressure = state.pressure;
53+
_previousRay = _ray;
54+
_ray = Ray{};
5555
clearRayContext();
5656
_previousHitPoint = _hitResult.hit ? std::optional<Vec3>(_hitResult.worldPoint) : std::nullopt;
5757
_hitResult = {};

axmol/scene/CameraBackgroundBrush.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void CameraBackgroundSkyBoxBrush::drawBackground(const SceneRenderState& state)
357357
groupCommand->init(-1.0f);
358358
_customCommand.init(0.0f);
359359

360-
Mat4 viewToWorld = state.getViewMatrix().getInversed();
360+
Mat4 viewToWorld = state.getViewMatrix().getInversed();
361361
const Mat4& projectionMat = state.getProjectionMatrix();
362362

363363
_customCommand.blendDesc().blendEnabled = false;

axmol/scene/Node.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ SceneViewData SceneViewData::fromMatrices(const Mat4& view, const Mat4& projecti
8989

9090
float SceneViewData::getDepthInView(const Mat4& transform) const
9191
{
92-
float camWorldZ = -(view.m[2] * transform.m[12] + view.m[6] * transform.m[13] + view.m[10] * transform.m[14] +
93-
view.m[14]);
92+
float camWorldZ =
93+
-(view.m[2] * transform.m[12] + view.m[6] * transform.m[13] + view.m[10] * transform.m[14] + view.m[14]);
9494
return camWorldZ;
9595
}
9696

@@ -111,8 +111,7 @@ SceneRenderState::SceneRenderState(Renderer* renderer, const Camera* camera, con
111111

112112
bool SceneRenderState::requiresVisibilityUpdate(uint32_t flags) const
113113
{
114-
return viewOverridden || (flags & Node::FLAGS_TRANSFORM_DIRTY) ||
115-
(camera && camera->isViewProjectionUpdated());
114+
return viewOverridden || (flags & Node::FLAGS_TRANSFORM_DIRTY) || (camera && camera->isViewProjectionUpdated());
116115
}
117116

118117
bool SceneRenderState::checkVisibility(const Mat4& transform, const Vec2& size) const
@@ -1298,8 +1297,8 @@ void Node::sortAllChildren()
12981297
void Node::draw()
12991298
{
13001299
auto renderer = _director->getRenderer();
1301-
auto scene = _director->getRunningScene();
1302-
auto camera = scene ? scene->getDefaultCamera() : nullptr;
1300+
auto scene = _director->getRunningScene();
1301+
auto camera = scene ? scene->getDefaultCamera() : nullptr;
13031302
SceneRenderState state(renderer, camera);
13041303
draw(state, _modelViewTransform, FLAGS_TRANSFORM_DIRTY);
13051304
}
@@ -1309,8 +1308,8 @@ void Node::draw(const SceneRenderState& /*state*/, const Mat4& /*transform*/, ui
13091308
void Node::visit()
13101309
{
13111310
auto renderer = _director->getRenderer();
1312-
auto scene = _director->getRunningScene();
1313-
auto camera = scene ? scene->getDefaultCamera() : nullptr;
1311+
auto scene = _director->getRunningScene();
1312+
auto camera = scene ? scene->getDefaultCamera() : nullptr;
13141313
SceneRenderState state(renderer, camera);
13151314
visit(state, Mat4::identity, FLAGS_TRANSFORM_DIRTY);
13161315
}

axmol/scene/Node.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ struct AX_DLL SceneViewData
108108

109109
struct AX_DLL SceneRenderState
110110
{
111-
Renderer* renderer = nullptr;
112-
const Camera* camera = nullptr;
111+
Renderer* renderer = nullptr;
112+
const Camera* camera = nullptr;
113113
SceneViewData view;
114-
unsigned short cameraFlag = 0;
115-
bool viewOverridden = false;
114+
unsigned short cameraFlag = 0;
115+
bool viewOverridden = false;
116116

117117
SceneRenderState() = default;
118118
SceneRenderState(Renderer* renderer, const Camera* camera);

0 commit comments

Comments
 (0)