Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 16:27:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed flow assignment operators

Browse source
This commit is contained in:
ksuprynowicz 2023-08-27 23:06:53 +02:00
parent 0c2fe4c81f
commit 38d44d079c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/Flow.cpp
View file

@ -445,6 +445,7 @@ void FlowThread::setScale(float scale, bool initScale) {
}
FlowThread& FlowThread::operator=(const FlowThread& otherFlowThread) {
_rigScale = otherFlowThread._rigScale;
for (int jointIndex: otherFlowThread._joints) {
auto& joint = otherFlowThread._jointsPointer->at(jointIndex);
auto& myJoint = _jointsPointer->at(jointIndex);
@ -798,6 +799,7 @@ Flow& Flow::operator=(const Flow& otherFlow) {
_active = otherFlow.getActive();
_scale = otherFlow.getScale();
_isScaleSet = true;
_rig = otherFlow._rig;
auto &threads = otherFlow.getThreads();
if (threads.size() == _jointThreads.size()) {
for (size_t i = 0; i < _jointThreads.size(); i++) {

3
libraries/animation/src/Flow.h
View file

@ -278,6 +278,7 @@ public:
std::vector<glm::vec3> _positions;
float _radius{ 0.0f };
float _length{ 0.0f };
// 100.0f was default rig scale when it was hardcoded but it caused issues with most avatars
float _rigScale { 100.0f };
std::map<int, FlowJoint>* _jointsPointer;
std::vector<glm::vec3> _rootFramePositions;
@ -324,8 +325,6 @@ private:
float _scale { 1.0f };
float _lastScale{ 1.0f };
// 100.0f was default rig scale when it was hardcoded but it caused issues with most avatars
//float _rigScale{ 100.0f };
// Rig to which flow system belongs, it's used for getting rig scale
Rig *_rig { nullptr };
glm::vec3 _entityPosition;