Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Features/multitexture2 #348

Merged
merged 9 commits into from
Aug 23, 2023
Merged

Features/multitexture2 #348

merged 9 commits into from
Aug 23, 2023

Commits on Jul 20, 2023

  1. updated packages

    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2a8559e View commit details
    Browse the repository at this point in the history

  2. first working version of #347 

    # Conflicts:
#	src/PRo3D.Core/Surface-Model.fs
#	src/PRo3D.Core/Surface/SurfaceApp.fs
#	src/PRo3D.Viewer/Utilities.fs
    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    8ec4c52 View commit details
    Browse the repository at this point in the history

  3. [multitexturing] refactored transfer function (no longer optional but… 

    … with default value); added blending
    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    1254c64 View commit details
    Browse the repository at this point in the history

  4. [multitexture] moved feature documentation

    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2cf9e42 View commit details
    Browse the repository at this point in the history

  5. added documentation

    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    d3896e9 View commit details
    Browse the repository at this point in the history

  6. updated package; fixed merge problem

    @haraldsteinlechner
    haraldsteinlechner committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    1970b39 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. initial sketch of query

    @haraldsteinlechner
    haraldsteinlechner committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    8ecdb4e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. queries sync

    @haraldsteinlechner
    haraldsteinlechner committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    5e00339 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'develop' into features/multitexture2

    @haraldsteinlechner
    haraldsteinlechner authored Aug 17, 2023
    Configuration menu
    Copy the full SHA
    f862b2e View commit details
    Browse the repository at this point in the history