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

Feature/add instanced mesh #69

Merged
merged 13 commits into from
Feb 16, 2021
Merged

Feature/add instanced mesh #69

merged 13 commits into from
Feb 16, 2021

Commits on May 25, 2020

  1. Merge pull request #1 from markaren/master 

    Add window favicon and update Kotlin to 1.3.72
    @Displee
    Displee committed May 25, 2020
    Configuration menu
    Copy the full SHA
    1203e29 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2020

  1. Merge pull request #2 from markaren/master 

    Merge from master fork
    @Displee
    Displee committed Sep 19, 2020
    Configuration menu
    Copy the full SHA
    c3a16d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from markaren/master 

    Custom mouse events
    @Displee
    Displee committed Sep 19, 2020
    Configuration menu
    Copy the full SHA
    85593e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2020

  1. Merge pull request #5 from markaren/master 

    Merge with threekt master
    @Displee
    Displee committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    47e6c65 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2020

  1. Merge pull request #6 from markaren/master 

    Update master
    @Displee
    Displee committed Nov 27, 2020
    Configuration menu
    Copy the full SHA
    f665f8f View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2020

  1. Merge pull request #7 from markaren/master 

    Add multi material ray intersecting for indexed and non-indexed buffe…
    @Displee
    Displee committed Nov 29, 2020
    Configuration menu
    Copy the full SHA
    8e5306e View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. Fix mip maps. Replace incorrect 2x2 texture. Fix mip maps example for… 

    … 90%.
    @Displee
    Displee committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    92627d5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Fix wrong usage of fromArray in Matrix4 class. Add instanced mesh ren… 

    …dering with raycasting. Add HemisphereLight support. Add instanced mesh example.
    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    c1d7fef View commit details
    Browse the repository at this point in the history

  2. Add TODO.

    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    f9b4ce6 View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict.

    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    14ee92c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:/Displee/three.kt into feature/ad… 

    …d-instanced-mesh
    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    c2c35e7 View commit details
    Browse the repository at this point in the history

  5. Remove commented code.

    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    5b1e851 View commit details
    Browse the repository at this point in the history

  6. Undo unintentional change.

    @Displee
    Displee committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    5750149 View commit details
    Browse the repository at this point in the history