Verified Commit f18a8bed authored by Tobias WEBER's avatar Tobias WEBER
Browse files

adapted to tlibs changes

parent 6fa2e8b1
...@@ -810,7 +810,7 @@ void MagStructFactDlg::Sync3DItem(int row) ...@@ -810,7 +810,7 @@ void MagStructFactDlg::Sync3DItem(int row)
auto normReM = tl2::norm<t_vec_gl>(vecReM); auto normReM = tl2::norm<t_vec_gl>(vecReM);
auto normImM = tl2::norm<t_vec_gl>(vecImM); auto normImM = tl2::norm<t_vec_gl>(vecImM);
t_mat_gl matArrowRe = GlPlotRenderer::GetArrowMatrix( t_mat_gl matArrowRe = tl2::get_arrow_matrix<t_vec_gl, t_mat_gl, t_real_gl>(
vecReM, // to vecReM, // to
1, // post-scale 1, // post-scale
tl2::create<t_vec_gl>({0, 0, 0}), // post-translate tl2::create<t_vec_gl>({0, 0, 0}), // post-translate
...@@ -819,7 +819,7 @@ void MagStructFactDlg::Sync3DItem(int row) ...@@ -819,7 +819,7 @@ void MagStructFactDlg::Sync3DItem(int row)
tl2::create<t_vec_gl>({posx, posy, posz}) // pre-translate tl2::create<t_vec_gl>({posx, posy, posz}) // pre-translate
); );
t_mat_gl matArrowIm = GlPlotRenderer::GetArrowMatrix( t_mat_gl matArrowIm = tl2::get_arrow_matrix<t_vec_gl, t_mat_gl, t_real_gl>(
vecImM, // to vecImM, // to
1, // post-scale 1, // post-scale
tl2::create<t_vec_gl>({0, 0, 0}), // post-translate tl2::create<t_vec_gl>({0, 0, 0}), // post-translate
...@@ -1930,7 +1930,7 @@ void MagStructFactDlg::Calc() ...@@ -1930,7 +1930,7 @@ void MagStructFactDlg::Calc()
auto normReM = tl2::norm<t_vec_gl>(vecReM); auto normReM = tl2::norm<t_vec_gl>(vecReM);
auto normImM = tl2::norm<t_vec_gl>(vecImM); auto normImM = tl2::norm<t_vec_gl>(vecImM);
t_mat_gl matArrowRe = GlPlotRenderer::GetArrowMatrix( t_mat_gl matArrowRe = tl2::get_arrow_matrix<t_vec_gl, t_mat_gl, t_real_gl>(
vecReM, // to vecReM, // to
1, // post-scale 1, // post-scale
tl2::create<t_vec_gl>({0, 0, 0}), // post-translate tl2::create<t_vec_gl>({0, 0, 0}), // post-translate
...@@ -1939,7 +1939,7 @@ void MagStructFactDlg::Calc() ...@@ -1939,7 +1939,7 @@ void MagStructFactDlg::Calc()
posGL // pre-translate posGL // pre-translate
); );
t_mat_gl matArrowIm = GlPlotRenderer::GetArrowMatrix( t_mat_gl matArrowIm = tl2::get_arrow_matrix<t_vec_gl, t_mat_gl, t_real_gl>(
vecImM, // to vecImM, // to
1, // post-scale 1, // post-scale
tl2::create<t_vec_gl>({0, 0, 0}), // post-translate tl2::create<t_vec_gl>({0, 0, 0}), // post-translate
......
...@@ -76,6 +76,7 @@ include_directories( ...@@ -76,6 +76,7 @@ include_directories(
"${PROJECT_SOURCE_DIR}/cli" "${PROJECT_SOURCE_DIR}/cli"
"${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.." "${FLEX_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.." "${FLEX_INCLUDE_DIRS}"
"${PROJECT_BINARY_DIR}/parser" "${PROJECT_BINARY_DIR}/parser"
"${Minuit2_INCLUDE_DIRS}"
"${QCP_INCLUDE_DIRS}" "${QCP_INCLUDE_DIRS}"
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment