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

chore: chore uuid #264

Merged
merged 48 commits into from
Jul 28, 2023
Merged

chore: chore uuid #264

merged 48 commits into from
Jul 28, 2023

Commits on Jun 5, 2023

  1. feat(grass): add grass system 

    add grass system
    @ZenderJK
    ZenderJK committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    66ddc5e View commit details
    Browse the repository at this point in the history

  2. feat(grass): fix render pass frame time 

    fix render pass frame time wrong
    @ZenderJK
    ZenderJK committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7737e06 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. fix(grass): fix grass segment 

    fix grass segment
    @ZenderJK
    ZenderJK committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    efe9614 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/Orillusion/orillusion into s… 

    …ample-grass
    @ZenderJK
    ZenderJK committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    7700784 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. fix(pbr): fix pbr shader 

    fix pbr shader
    @ZenderJK
    ZenderJK committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    4b81d6d View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. fix(pbr): fix clear coat lighting specular 

    fix clear coat lighting specular
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    3658df5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dt-human' into sample-grass 

    # Conflicts:
#	src/assets/shader/lighting/BRDF_frag.ts
#	src/assets/shader/lighting/BxDF_frag.ts
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    c345632 View commit details
    Browse the repository at this point in the history

  3. fix(pbr): fix clear coat lighting specular 

    fix clear coat lighting specular
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    26485df View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dt-human' of https://github.com/X-OldGentleMan/orillusion… 

    … into dt-human
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    b878c45 View commit details
    Browse the repository at this point in the history

  5. fix(grass): fix grass size and vertex animation 

    fix grass size and vertex animation
change wind texture
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    c00a3e5 View commit details
    Browse the repository at this point in the history

  6. fix(grass): fix grass size and vertex animation 

    fix grass size and vertex animation
change wind texture
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    86c034d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'sample-grass' of https://github.com/X-OldGentleMan/oril… 

    …lusion into sample-grass
    @ZenderJK
    ZenderJK committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    f4f9652 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Merge branch 'sample-grass' of https://github.com/X-OldGentleMan/oril… 

    …lusion into sample-grass
    @ZenderJK
    ZenderJK committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    d3fc897 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sample-grass' of https://github.com/X-OldGentleMan/oril… 

    …lusion into sample-grass
    @ZenderJK
    ZenderJK committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    c1b95da View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge branch 'sample-grass' into dt-human

    @ZenderJK
    ZenderJK committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    0c27251 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. fix(clearcoat): fix muilt layer clearcoat 

    fix muilt layer clearcoat
    @ZenderJK
    ZenderJK committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    aee158e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. fix(clearcoat): fix clear coat 

    fix clear coat shader
fix global fog
    @ZenderJK
    ZenderJK committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    85af4cc View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. fix(normal): fix normal map 

    fix normal map dir scale
    @ZenderJK
    ZenderJK committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    eb81f52 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. feat(sample): add physic car 

    add physic car sample
add terrain sample
    @ZenderJK
    ZenderJK committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    2869f2c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/Orillusion/orillusion into d… 

    …t-human

# Conflicts:
#	package.json
#	samples/utils/GUIUtil.ts
#	src/Engine3D.ts
#	src/assets/shader/post/GlobalFog_shader.ts
#	src/gfx/renderJob/post/GlobalFog.ts
    @ZenderJK
    ZenderJK committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    716cc32 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. chore: change collect render node 

    change collect render node
add lambert material
commit gpu buffer by buffer mapasync
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    c3d0f13 View commit details
    Browse the repository at this point in the history

  2. fix(renderer): fix shadow render node 

    fix shadow render node
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    ae90ab5 View commit details
    Browse the repository at this point in the history

  3. fix(pointShadow): fix point shadow 

    fix point shadow
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    4583f27 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.com/Orillusion/orillusion into d… 

    …t-human

# Conflicts:
#	src/gfx/graphics/webGpu/Context3D.ts
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    d41a5a2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/Orillusion/orillusion into d… 

    …t-human
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    012414c View commit details
    Browse the repository at this point in the history

  6. chore: remove ssh 

    remove ssh
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    2efa084 View commit details
    Browse the repository at this point in the history

  7. chore: chore transform 

    chore transform
    @ZenderJK
    ZenderJK committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    c0f8f27 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. fix(fog): fix fog shader. 

    fix fog shader.
    @hellmor
    hellmor committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    01b96e8 View commit details
    Browse the repository at this point in the history

  2. fix(shader): fix pbr shader 

    fix pbr metallic map and ao map
add draw call sample
    @ZenderJK
    ZenderJK committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    1ad0413 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. fix(mac): fix shadow maping at mac error 

    fix shadow maping at mac error
    @ZenderJK
    ZenderJK committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    bf49f3e View commit details
    Browse the repository at this point in the history

  2. fix(renderNode): fix render node

    @ZenderJK
    ZenderJK committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a1c1567 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Orillusion/orillusion into 2… 

    …023726

# Conflicts:
#	src/Engine3D.ts
#	src/components/Transform.ts
#	src/components/renderer/RenderNode.ts
#	src/core/entities/Entity.ts
#	src/io/PickFire.ts
    @ZenderJK
    ZenderJK committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ebc5fef View commit details
    Browse the repository at this point in the history

  4. update package

    @lslzl3000
    lslzl3000 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    deac94a View commit details
    Browse the repository at this point in the history

  5. fix vite.config.js

    @lslzl3000
    lslzl3000 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4806aec View commit details
    Browse the repository at this point in the history

  6. fix build

    @lslzl3000
    lslzl3000 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    6bee1a8 View commit details
    Browse the repository at this point in the history

  7. fix(transform): fix transform notifyLocalChange error 

    fix transform notifyLocalChange error
fix instanceDraw
    @ZenderJK
    ZenderJK committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7162b4f View commit details
    Browse the repository at this point in the history

  8. Merge branch '2023726' of https://github.com/X-OldGentleMan/orillusion … 

    …into 2023726
    @ZenderJK
    ZenderJK committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c377cf5 View commit details
    Browse the repository at this point in the history

  9. update public

    @lslzl3000
    lslzl3000 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a766ab6 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. fix(pbr): fix pbr color 

     fix pbr color
    @ZenderJK
    ZenderJK committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0aa7652 View commit details
    Browse the repository at this point in the history

  2. fix: code style. 

    code format.
    @hellmor
    hellmor committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    eb944fc View commit details
    Browse the repository at this point in the history

  3. fix(conflict):bxdf file. 

    fix(conflict):bxdf file.
    @hellmor
    hellmor committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    700076d View commit details
    Browse the repository at this point in the history

  4. chore: chore sample light 

    chore sample light
    @ZenderJK
    ZenderJK committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    24d0096 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2023726' of https://github.com/X-OldGentleMan/orillusion … 

    …into 2023726
    @ZenderJK
    ZenderJK committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ce76d98 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. fix(pick): use pick enable 

    use pick enable
    @ZenderJK
    ZenderJK committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    fedc5c6 View commit details
    Browse the repository at this point in the history

  2. fix(geometry): fix geometry repeat init 

    fix geometry repeat init
change uuid to instanceID
change transform update
    @ZenderJK
    ZenderJK committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    cbce687 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/Orillusion/orillusion into 2… 

    …023726

# Conflicts:
#	samples/benchmark/Sample_SphereDraw.ts
#	samples/benchmark/Sample_drawCall.ts
#	src/Engine3D.ts
#	src/components/Transform.ts
#	src/components/renderer/RenderNode.ts
    @ZenderJK
    ZenderJK committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    e5213ab View commit details
    Browse the repository at this point in the history

  4. doc: remove doc 

    remove doc
    @ZenderJK
    ZenderJK committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    9580e8b View commit details
    Browse the repository at this point in the history

  5. fix(components): back stop 

    back stop
    @ZenderJK
    ZenderJK committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    384dc9b View commit details
    Browse the repository at this point in the history