maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

standard order of scale/translation

Browse Source
This commit is contained in:
Nick Fisher
2022-09-06 19:37:39 +10:00
parent ea39d8c25d
commit 1bade94c32
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/src/SceneAsset.cpp
View File

@@ -290,7 +290,7 @@ void SceneAsset::transformToUnitCube() {
void SceneAsset::updateTransform() { void SceneAsset::updateTransform() {
auto &tm = _engine->getTransformManager(); auto &tm = _engine->getTransformManager();
auto transform = auto transform =
math::mat4f::scaling(_scale) * _position * _rotation; _position * _rotation * math::mat4f::scaling(_scale);
tm.setTransform(tm.getInstance(_asset->getRoot()), transform); tm.setTransform(tm.getInstance(_asset->getRoot()), transform);
} }

4
ios/src/SceneAsset.hpp
View File

@@ -108,8 +108,12 @@ namespace polyvox {
// a slot to preload textures // a slot to preload textures
filament::Texture* _texture = nullptr; filament::Texture* _texture = nullptr;
// initialized to identity
math::mat4f _position; math::mat4f _position;
// initialized to identity
math::mat4f _rotation; math::mat4f _rotation;
float _scale = 1; float _scale = 1;
void updateTransform(); void updateTransform();