Uni/CGII
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Build dependency

Browse source
This commit is contained in:
hodasemi 2018-05-29 22:28:59 +02:00
parent 52db577e51
commit fd53e8e1e3
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

@ -52,7 +52,8 @@
"typeinfo": "cpp", "typeinfo": "cpp",
"utility": "cpp", "utility": "cpp",
"variant": "cpp", "variant": "cpp",
"algorithm": "cpp" "algorithm": "cpp",
"new": "cpp"
}, },
"editor.formatOnSave": true "editor.formatOnSave": true
} }

3
.vscode/tasks.json vendored
View file

@ -12,7 +12,8 @@
"plugin:cg_fltk.cgv", "plugin:cg_fltk.cgv",
"plugin:CGII.cgv", "plugin:CGII.cgv",
"plugin:crg_stereo_view.cgv" "plugin:crg_stereo_view.cgv"
] ],
"dependsOn": "Build CGII"
}, },
{ {
"label": "Build All", "label": "Build All",

13
CGII/src/Bone.cpp
View file

@ -41,12 +41,17 @@ void Bone::calculate_matrices()
{ {
orientationTransformGlobalToLocal.identity(); orientationTransformGlobalToLocal.identity();
std::for_each(orientation.begin(), orientation.end(), [&](AtomicTransform *t) { std::for_each(orientation.begin(), orientation.end(), [&](AtomicTransform *t) {
std::cout << "atomic transform " << t->get_name() << ": " << t->get_value() << std::endl; std::cout << name << " orientation " << t->get_name() << ": " << t->get_value() << std::endl;
orientationTransformGlobalToLocal = orientationTransformGlobalToLocal * t->calculate_matrix(); orientationTransformGlobalToLocal = orientationTransformGlobalToLocal * t->calculate_matrix();
}); });
orientationTransformLocalToGlobal = cgv::math::inv(orientationTransformGlobalToLocal); orientationTransformLocalToGlobal = cgv::math::inv(orientationTransformGlobalToLocal);
std::for_each(dofs.begin(), dofs.end(), [&](std::shared_ptr<AtomicTransform> &t) {
//std::cout << "dofs " << t->get_name() << ": " << t->get_value() << std::endl;
});
/*Task 2.1: Implement matrix calculation */ /*Task 2.1: Implement matrix calculation */
Mat4 matrix; Mat4 matrix;
matrix.identity(); matrix.identity();
@ -109,17 +114,17 @@ Mat4 Bone::calculate_transform_prev_to_current_with_dofs()
dofs.identity(); dofs.identity();
std::for_each(orientation.begin(), orientation.end(), [&](AtomicTransform *t) { std::for_each(orientation.begin(), orientation.end(), [&](AtomicTransform *t) {
dofs = dofs * t->calculate_matrix(); //dofs = dofs * t->calculate_matrix();
}); });
Mat4 t = translationTransformCurrentJointToNext * orientationTransformPrevJointToCurrent * dofs; Mat4 t = translationTransformCurrentJointToNext * orientationTransformPrevJointToCurrent * dofs; // * orientationTransformGlobalToLocal;
return t; return t;
} }
Mat4 Bone::calculate_transform_prev_to_current_without_dofs() Mat4 Bone::calculate_transform_prev_to_current_without_dofs()
{ {
//Task 2.1: Implement matrix calculation //Task 2.1: Implement matrix calculation
Mat4 t = translationTransformCurrentJointToNext * orientationTransformPrevJointToCurrent; Mat4 t = translationTransformCurrentJointToNext * orientationTransformPrevJointToCurrent * orientationTransformLocalToGlobal * orientationTransformGlobalToLocal;
return t; return t;
} }