Skip to content

Commit 0da812a

Browse files
axmol-botgithub-actions[bot]
authored andcommitted
Committing clang-format changes
1 parent 0f7f436 commit 0da812a

6 files changed

Lines changed: 21 additions & 21 deletions

File tree

axmol/2d/Grid.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,11 @@ void Grid3D::updateVertexBuffer()
503503
auto offset = i * (sizeof(Vec3) + sizeof(Vec2));
504504
if (_screenProjectionForBlitEnabled)
505505
{
506-
auto vertex = projectGridVertexToCanvas(_screenProjectionForBlit, tempVecPointer[i],
507-
_screenProjectionForBlitSize);
508-
auto texCoord = projectGridTexCoordToCanvas(_screenProjectionForBlit, tempOriginalVecPointer[i],
509-
_screenProjectionForBlitSize, _isTextureFlipped,
510-
tempTexPointer[i]);
506+
auto vertex =
507+
projectGridVertexToCanvas(_screenProjectionForBlit, tempVecPointer[i], _screenProjectionForBlitSize);
508+
auto texCoord =
509+
projectGridTexCoordToCanvas(_screenProjectionForBlit, tempOriginalVecPointer[i],
510+
_screenProjectionForBlitSize, _isTextureFlipped, tempTexPointer[i]);
511511
memcpy((char*)_vertexBuffer + offset, &vertex, sizeof(Vec3));
512512
memcpy((char*)_vertexBuffer + offset + sizeof(Vec3), &texCoord, sizeof(Vec2));
513513
}
@@ -775,11 +775,11 @@ void TiledGrid3D::updateVertexBuffer()
775775
auto offset = i * (sizeof(Vec3) + sizeof(Vec2));
776776
if (_screenProjectionForBlitEnabled)
777777
{
778-
auto vertex = projectGridVertexToCanvas(_screenProjectionForBlit, tempVecPointer[i],
779-
_screenProjectionForBlitSize);
780-
auto texCoord = projectGridTexCoordToCanvas(_screenProjectionForBlit, tempOriginalVecPointer[i],
781-
_screenProjectionForBlitSize, _isTextureFlipped,
782-
tempTexPointer[i]);
778+
auto vertex =
779+
projectGridVertexToCanvas(_screenProjectionForBlit, tempVecPointer[i], _screenProjectionForBlitSize);
780+
auto texCoord =
781+
projectGridTexCoordToCanvas(_screenProjectionForBlit, tempOriginalVecPointer[i],
782+
_screenProjectionForBlitSize, _isTextureFlipped, tempTexPointer[i]);
783783
memcpy((char*)_vertexBuffer + offset, &vertex, sizeof(Vec3));
784784
memcpy((char*)_vertexBuffer + offset + sizeof(Vec3), &texCoord, sizeof(Vec2));
785785
}

axmol/2d/NodeGrid.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ void NodeGrid::visit(Renderer* renderer, const Mat4& parentTransform, uint32_t p
127127
_modelViewTransform = this->transform(parentTransform);
128128
_transformUpdated = false;
129129

130-
auto activeGrid = _nodeGrid && _nodeGrid->isActive();
131-
auto previousCamera = const_cast<Camera*>(Camera::getVisitingCamera());
130+
auto activeGrid = _nodeGrid && _nodeGrid->isActive();
131+
auto previousCamera = const_cast<Camera*>(Camera::getVisitingCamera());
132132

133133
auto gridCam = activeGrid ? getGridCamera() : nullptr;
134134
auto switchedCamera = gridCam != nullptr;
@@ -180,9 +180,9 @@ void NodeGrid::visit(Renderer* renderer, const Mat4& parentTransform, uint32_t p
180180
// canvas ortho matrix. Projecting the uploaded grid vertices/UVs keeps
181181
// tile edges in the same camera space as the captured texture.
182182
const auto& screenProjection = previousCamera ? previousCamera->getViewProjectionMatrix() : Mat4::identity;
183-
_nodeGrid->setScreenProjectionForBlit(_projectGridBlitToVisitingCamera && previousCamera ? &screenProjection
184-
: nullptr,
185-
_director->getCanvasSize());
183+
_nodeGrid->setScreenProjectionForBlit(
184+
_projectGridBlitToVisitingCamera && previousCamera ? &screenProjection : nullptr,
185+
_director->getCanvasSize());
186186
}
187187

188188
// Switch to grid camera before blit so that Grid3D::blit() /

axmol/platform/RenderViewCore.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ RenderViewCore::RenderViewCore()
5656

5757
RenderViewCore::~RenderViewCore() {}
5858

59-
void RenderViewCore::pollEvents() { _sceneCompositor->pollEvents(); }
59+
void RenderViewCore::pollEvents()
60+
{
61+
_sceneCompositor->pollEvents();
62+
}
6063

6164
void RenderViewCore::updateDesignResolution()
6265
{

axmol/platform/RenderViewCore.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@ class AX_DLL RenderViewCore : public Object
479479
void setSceneCompositor(std::unique_ptr<SceneCompositor>&& compositor);
480480

481481
protected:
482-
483482
void renderScene(Renderer* renderer, Scene* scene);
484483

485484
void maybeDispatchResizeEvent(uint8_t updateFlag);

axmol/scene/SceneCompositor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ SceneCompositor::SceneCompositor()
4545
_director = Director::getInstance();
4646
}
4747

48-
void SceneCompositor::pollEvents()
49-
{
50-
}
48+
void SceneCompositor::pollEvents() {}
5149

5250
void SceneCompositor::renderScene(Renderer* renderer, Scene* scene)
5351
{

tests/cpp-tests/Source/VRTest/VRTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ std::string VRTest1::subtitle() const
121121

122122
void VRTest1::onRadioGroupChanged(ui::RadioButton* sender, int index, ui::RadioButtonGroup::EventType type)
123123
{
124-
auto director = Director::getInstance();
124+
auto director = Director::getInstance();
125125
auto renderView = director->getRenderView();
126126
switch (index)
127127
{

0 commit comments

Comments
 (0)