Skip to content
Snippets Groups Projects

Feature/camera per view

Merged Julius Nehring-Wirxel requested to merge feature/camera-per-view into develop
4 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
284 284 mPos = position;
285 285 mTargetDistance = tg::length(dir);
286 286 mFwd = -normalize(dir);
287 mRight = normalize(cross(mFwd, tg::vec3::unit_y));
287 auto r = cross(mFwd, tg::vec3::unit_y);
288 if (r == tg::vec3::zero) // looking up or down
  • 171 172 dUp += int(mKeyE) * speed;
    172 173 dUp -= int(mKeyQ) * speed;
    173 174
    174 mCamera->moveCamera(dRight, dFwd, dUp, dt);
    175 bool captured = false;
    176 for (auto& node : mLayoutNodes)
    177 {
    178 if (node.scene.customCameraController)
    179 {
    180 auto const node_bb = tg::iaabb2(node.start, node.size);
    181 if (contains(node_bb, tg::ipos2(mLastX, mLastY)))
    182 {
    183 node.scene.customCameraController->moveCamera(dRight, dFwd, dUp, dt);
    184 captured = true;
    185 }
    186 node.scene.customCameraController->update(dt);
  • 311 338 }
    312 339 else
    313 340 {
    314 // camera movement
    341 bool captured = false;
    342 for (auto& node : mLayoutNodes)
    315 343 {
    344 auto const node_aabb = tg::iaabb2(node.start, node.size);
    345 if (node.scene.customCameraController && tg::contains(node_aabb, tg::ipos2(x, y)))
    346 {
    347 auto minS = double(tg::min(getWindowWidth(), getWindowHeight())); // correct?
  • 517 573 }
    518 574 else
    519 575 {
    520 mCamera->zoom(float(sy));
    576 bool captured = false;
    577 for (auto& node : mLayoutNodes)
  • added 1 commit

    • 1f86e0bc - Added helper to get the camera from the cursor position.

    Compare with previous version

  • added 1 commit

    • 94e91856 - changed r == tg::vec3::zero to tg::is_zero_vector(r)

    Compare with previous version

  • Philip Trettner mentioned in commit 0f852c57

    mentioned in commit 0f852c57

  • Please register or sign in to reply
    Loading