Skip to content
Snippets Groups Projects

Feature/#470 create a color lookup table

Merged Jan Delember requested to merge feature/#470_Create_a_color_lookup_table into master
All threads resolved!

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Jan DelemberJan Delember 6 years ago (Jul 31, 2018 11:30am UTC)

Merge details

  • Changes merged into master with e0aea5e7.
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jan Delember added 1 commit

    added 1 commit

    • 1677fead - Rename Interpolation modes to match google style

    Compare with previous version

    By Jan Müller on 2018-07-12T07:19:35 (imported from GitLab)

  • Jan Delember resolved all discussions

    resolved all discussions

    By Andrea Bönsch on 2018-07-12T08:48:17 (imported from GitLab)

  • Jan Delember
  • Jan Delember marked as a Work In Progress

    marked as a Work In Progress

    By Martin Bellgardt on 2018-07-19T08:17:00 (imported from GitLab)

  • Jan Delember resolved all discussions

    resolved all discussions

    By Jan Müller on 2018-07-19T09:19:26 (imported from GitLab)

  • Jan Delember added 7 commits

    added 7 commits

    • caaf1ea0 - Add a method to generate a lookuptable
    • 3bd8b394 - Reomove lookuptable from Transfer Function
    • e869e2e1 - Reomove lookuptable from transferfunction test
    • e7e8bf09 - Add LookupTable class
    • 48b3363a - add lookuptable test to mocked tests
    • 6b894217 - add '__glewTextureSubImage1D' and '__glewTextureStorage1D' to opengl_mock
    • 21ce5574 - add some kind of test for texture1D creation

    Compare with previous version

    By Jan Müller on 2018-07-25T13:01:26 (imported from GitLab)

  • Jan Delember added 124 commits

    added 124 commits

    • 21ce5574...eb345e95 - 122 commits from branch master
    • af43627e - Merge branch 'master' into feature/#470_Create_a_color_lookup_table
    • cc748aed - change GetColor parameter to size_t

    Compare with previous version

    By Jan Müller on 2018-07-25T13:25:39 (imported from GitLab)

  • Jan Delember added 1 commit

    added 1 commit

    • 461536ab - define GLM_ENABLE_EXPERIMENTAL to use glm::lerp

    Compare with previous version

    By Jan Müller on 2018-07-25T13:41:42 (imported from GitLab)

  • Jan Delember unmarked as a Work In Progress

    unmarked as a Work In Progress

    By Jan Müller on 2018-07-25T14:02:40 (imported from GitLab)

  • Jan Delember
  • Jan Delember added 2 commits

    added 2 commits

    • 454c1428 - make sure entries are sorted
    • e5aa5bc7 - make Transferfunction not a resource

    Compare with previous version

    By Jan Müller on 2018-07-27T12:58:23 (imported from GitLab)

  • Jan Delember resolved all discussions

    resolved all discussions

    By Jan Müller on 2018-07-27T13:46:51 (imported from GitLab)

  • merged

    By Martin Bellgardt on 2018-07-31T11:30:24 (imported from GitLab)

  • Jan Delember mentioned in commit e0aea5e7

    mentioned in commit e0aea5e7

    By Martin Bellgardt on 2018-07-31T11:30:26 (imported from GitLab)

  • Please register or sign in to reply
    Loading