Linux/Clang fix warn-unused and related
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>monroegm-disable-blank-issue-2
Esteban Papp
4 years ago
committed by
GitHub
commit
0750dd59ca
@ -1,75 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
// Description : Calculate the reference frame for sub-object selections.
|
|
||||||
|
|
||||||
#include "EditorDefs.h"
|
|
||||||
|
|
||||||
#include "SubObjectSelectionReferenceFrameCalculator.h"
|
|
||||||
|
|
||||||
SubObjectSelectionReferenceFrameCalculator::SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType)
|
|
||||||
: m_anySelected(false)
|
|
||||||
, pos(0.0f, 0.0f, 0.0f)
|
|
||||||
, normal(0.0f, 0.0f, 0.0f)
|
|
||||||
, nNormals(0)
|
|
||||||
, selectionType(selectionType)
|
|
||||||
, bUseExplicitFrame(false)
|
|
||||||
, bExplicitAnySelected(false)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SubObjectSelectionReferenceFrameCalculator::SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame)
|
|
||||||
{
|
|
||||||
this->m_refFrame = refFrame;
|
|
||||||
this->bUseExplicitFrame = true;
|
|
||||||
this->bExplicitAnySelected = bAnySelected;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SubObjectSelectionReferenceFrameCalculator::GetFrame(Matrix34& refFrame)
|
|
||||||
{
|
|
||||||
if (this->bUseExplicitFrame)
|
|
||||||
{
|
|
||||||
refFrame = this->m_refFrame;
|
|
||||||
return this->bExplicitAnySelected;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
refFrame.SetIdentity();
|
|
||||||
|
|
||||||
if (this->nNormals > 0)
|
|
||||||
{
|
|
||||||
this->normal = this->normal / static_cast<float>(this->nNormals);
|
|
||||||
if (!this->normal.IsZero())
|
|
||||||
{
|
|
||||||
this->normal.Normalize();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Average position.
|
|
||||||
this->pos = this->pos / static_cast<float>(this->nNormals);
|
|
||||||
refFrame.SetTranslation(this->pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->m_anySelected)
|
|
||||||
{
|
|
||||||
if (!this->normal.IsZero())
|
|
||||||
{
|
|
||||||
Vec3 xAxis(1, 0, 0), yAxis(0, 1, 0), zAxis(0, 0, 1);
|
|
||||||
if (this->normal.IsEquivalent(zAxis) || normal.IsEquivalent(-zAxis))
|
|
||||||
{
|
|
||||||
zAxis = xAxis;
|
|
||||||
}
|
|
||||||
xAxis = this->normal.Cross(zAxis).GetNormalized();
|
|
||||||
yAxis = xAxis.Cross(this->normal).GetNormalized();
|
|
||||||
refFrame.SetFromVectors(xAxis, yAxis, normal, pos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return m_anySelected;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
// Description : Calculate the reference frame for sub-object selections.
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
#define CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
|
|
||||||
#include "ISubObjectSelectionReferenceFrameCalculator.h"
|
|
||||||
#include "Objects/SubObjSelection.h"
|
|
||||||
|
|
||||||
class SubObjectSelectionReferenceFrameCalculator
|
|
||||||
: public ISubObjectSelectionReferenceFrameCalculator
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType);
|
|
||||||
|
|
||||||
virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame);
|
|
||||||
bool GetFrame(Matrix34& refFrame);
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_anySelected;
|
|
||||||
Vec3 pos;
|
|
||||||
Vec3 normal;
|
|
||||||
int nNormals;
|
|
||||||
ESubObjElementType selectionType;
|
|
||||||
std::vector<Vec3> positions;
|
|
||||||
Matrix34 m_refFrame;
|
|
||||||
bool bUseExplicitFrame;
|
|
||||||
bool bExplicitAnySelected;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // CRYINCLUDE_EDITOR_EDITMODE_SUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
// Description : Calculate the reference frame for sub-object selections.
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
#define CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
|
|
||||||
class ISubObjectSelectionReferenceFrameCalculator
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual void SetExplicitFrame(bool bAnySelected, const Matrix34& refFrame) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // CRYINCLUDE_EDITOR_INCLUDE_ISUBOBJECTSELECTIONREFERENCEFRAMECALCULATOR_H
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue