Skip to content

FIX: avoid creating new objects, reference pre-existing static objects #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gyfdb wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

FIX: avoid creating new objects, reference pre-existing static objects #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Client/App/util/Math.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ namespace RBX

const G3D::Matrix3& Math::getAxisRotationMatrix(int face)
{
static G3D::Matrix3 y = G3D::Matrix3::fromEulerAnglesXYZ(0, 0, G3D::halfPi());
static G3D::Matrix3 z = G3D::Matrix3::fromEulerAnglesXYZ(0, G3D::halfPi(), 0);
static G3D::Matrix3 y = G3D::Matrix3::fromEulerAnglesXYZ(0.0f, 0.0f, (float)G3D::halfPi());
static G3D::Matrix3 z = G3D::Matrix3::fromEulerAnglesXYZ(0.0f, (float)G3D::halfPi(), 0.0f);
static G3D::Matrix3 y_neg = G3D::Matrix3(y);
static G3D::Matrix3 z_neg = G3D::Matrix3(z);

Expand Down
4 changes: 2 additions & 2 deletions Client/Rendering/AppDraw/Draw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace RBX

G3D::Vector3 halfSize = part.gridSize * 0.5f;

G3D::Matrix3 rot = Math::getAxisRotationMatrix(face);
const G3D::Matrix3& relativeRotation = Math::getAxisRotationMatrix(face);

G3D::Vector3 relativeTranslation;

Expand All @@ -93,7 +93,7 @@ namespace RBX

relativeTranslation[axis] = halfSize[axis]*posNeg;

G3D::CoordinateFrame translation(rot, relativeTranslation);
G3D::CoordinateFrame translation(relativeRotation, relativeTranslation);
G3D::CoordinateFrame newObject = part.coordinateFrame*translation;

adorn->setObjectToWorldMatrix(newObject);
Expand Down