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

WIP: Metaballs #242

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

WIP: Metaballs #242

wants to merge 34 commits into from

Commits on Mar 15, 2020

  1. Add initial metaballs demo, unoptimized raymarching implemented with … 

    …multiple metaballs
    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    50e04ef View commit details
    Browse the repository at this point in the history

  2. Add phong shading with point lights

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    a9aa271 View commit details
    Browse the repository at this point in the history

  3. Add negative metaballs support

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    a2d918e View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Load metaballs per texture

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    46a7b96 View commit details
    Browse the repository at this point in the history

  2. Load lights per texture

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    c88d317 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Add cubemap, though the lookup seems to be broken, defering for later… 

    …, attempting to use the Texture2d class
    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    2bbdd43 View commit details
    Browse the repository at this point in the history

  2. Refactore light and metaball texture to Texture2D-class

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    bd95a3a View commit details
    Browse the repository at this point in the history

  3. Fix wrong raymarching. though raymarching is still inefficient

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    470bb46 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Make raymarhc function universal and handle 3d instead of 2d

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    bc66b0b View commit details
    Browse the repository at this point in the history

  2. Failed to introduce camera into fragment shader, implement faster ray… 

    …march
    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    ff9669a View commit details
    Browse the repository at this point in the history

  3. Add metaballs color texture

    Martin Buessemeyer authored and Martin Buessemeyer committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    5c734c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Add refraction

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    e5919b8 View commit details
    Browse the repository at this point in the history

  2. partially fix newton method

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    2737906 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. Fix newton method

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    339b462 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Seeing metaalls with camera matrix

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    3a46aa4 View commit details
    Browse the repository at this point in the history

  2. Add reflection

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    7f175fe View commit details
    Browse the repository at this point in the history

  3. Add refraction and interpolation though it does not look correctly

    Martin Buessemeyer authored and Martin Buessemeyer committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    41e931a View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Merge branch 'master' into metaballs

    @cgcostume
    cgcostume authored May 1, 2020
    Configuration menu
    Copy the full SHA
    3427ccd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into metaballs

    @cgcostume
    cgcostume authored May 1, 2020
    Configuration menu
    Copy the full SHA
    0a77599 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into metaballs

    @cgcostume
    cgcostume authored May 1, 2020
    Configuration menu
    Copy the full SHA
    8d76ef1 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. remove function that were almost duplicates

    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    8786a1e View commit details
    Browse the repository at this point in the history

  2. remove unused code and organize functions

    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    6f2c281 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'metaballs' of github.com:cginternals/webgl-operate into… 

    … metaballs
    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    f75970f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:cginternals/webgl-operate into me… 

    …taballs
    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    1b3bfd7 View commit details
    Browse the repository at this point in the history

  5. fix cubemap faces and fix refraction artifact caused by too low initi… 

    …al distance when when raymarching
    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    ee2185a View commit details
    Browse the repository at this point in the history

  6. add random colors and place metaball behind camera

    Martin Buessemeyer authored and Martin Buessemeyer committed May 3, 2020
    Configuration menu
    Copy the full SHA
    c91102f View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. start implementing physics rendering, missing: invoke each second, fo… 

    …rce vector field
    Martin Buessemeyer authored and Martin Buessemeyer committed May 9, 2020
    Configuration menu
    Copy the full SHA
    cfc586a View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. fix camera rotation

    Martin Buessemeyer authored and Martin Buessemeyer committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    d9cec56 View commit details
    Browse the repository at this point in the history

  2. add missing physics shader

    Martin Buessemeyer authored and Martin Buessemeyer committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    0f22e4f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. fix physics shader, buffer texture in array (is slower than texel fetch)

    Martin Buessemeyer authored and Martin Buessemeyer committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    c775744 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. readd light textures, fix physics shader for nvidia, add individual v… 

    …ector
    Martin Buessemeyer authored and Martin Buessemeyer committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    6f46d75 View commit details
    Browse the repository at this point in the history

  2. change sec point light position, remove pointlight struct

    Martin Buessemeyer authored and Martin Buessemeyer committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    20959cc View commit details
    Browse the repository at this point in the history

  3. random metaball position

    Martin Buessemeyer authored and Martin Buessemeyer committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    650eb23 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2022

  1. Merge branch 'master' into metaballs

    @cgcostume
    cgcostume authored Mar 1, 2022
    Configuration menu
    Copy the full SHA
    6a58a09 View commit details
    Browse the repository at this point in the history