Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mrdoob/three.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d677b47d6087cbb2c0b961981257cdd360a699e2
Choose a base ref
...
head repository: mrdoob/three.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20ad44c2b651ee5ce539051ed9729da5fb0a6c65
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 30, 2020

  1. Add generic Renderer to Object3D and use it when extending for css re… 

    …nderers
    @juliendargelos
    juliendargelos committed Jan 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58210a1 View commit details

  2. Move generic Renderer to callback functions

    @juliendargelos
    juliendargelos committed Jan 30, 2020
    Copy the full SHA
    19ae971 View commit details

  3. Add missing scene parameter in renderObject call

    @juliendargelos
    juliendargelos committed Jan 30, 2020
    Copy the full SHA
    c9988a5 View commit details

  4. Merge pull request #18519 from juliendargelos/css2drenderer-callbacks 

    CSS2DRenderer: Add missing scene parameter in renderObject call
    @mrdoob
    mrdoob authored Jan 30, 2020
    Copy the full SHA
    acd8787 View commit details

  5. Merge pull request #18518 from juliendargelos/css3object-generic-rend… 

    …erer

Add generic Renderer to Object3D and use it when extending for css renderers
    @mrdoob
    mrdoob authored Jan 30, 2020
    Copy the full SHA
    20883ac View commit details

  6. Updated modules.

    @mrdoob
    mrdoob committed Jan 30, 2020
    Copy the full SHA
    20ad44c View commit details
2 changes: 1 addition & 1 deletion examples/js/renderers/CSS2DRenderer.js
View file
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ THREE.CSS2DRenderer = function () {

for ( var i = 0, l = object.children.length; i < l; i ++ ) {

renderObject( object.children[ i ], camera );
renderObject( object.children[ i ], scene, camera );

}

4 changes: 2 additions & 2 deletions examples/jsm/renderers/CSS2DRenderer.d.ts
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ export class CSS2DObject extends Object3D {
constructor( element: HTMLElement );
element: HTMLElement;

onBeforeRender: (renderer: CSS2DRenderer, scene: Scene, camera: Camera) => void;
onAfterRender: (renderer: CSS2DRenderer, scene: Scene, camera: Camera) => void;
onBeforeRender: <Renderer = CSS2DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onAfterRender: <Renderer = CSS2DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;

}

2 changes: 1 addition & 1 deletion examples/jsm/renderers/CSS2DRenderer.js
View file
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ var CSS2DRenderer = function () {

for ( var i = 0, l = object.children.length; i < l; i ++ ) {

renderObject( object.children[ i ], camera );
renderObject( object.children[ i ], scene, camera );

}

4 changes: 2 additions & 2 deletions examples/jsm/renderers/CSS3DRenderer.d.ts
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ export class CSS3DObject extends Object3D {
constructor( element: HTMLElement );
element: HTMLElement;

onBeforeRender: (renderer: CSS3DRenderer, scene: Scene, camera: Camera) => void;
onAfterRender: (renderer: CSS3DRenderer, scene: Scene, camera: Camera) => void;
onBeforeRender: <Renderer = CSS3DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onAfterRender: <Renderer = CSS3DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;

}

8 changes: 4 additions & 4 deletions src/core/Object3D.d.ts
View file
Original file line number Diff line number Diff line change
@@ -153,8 +153,8 @@ export class Object3D extends EventDispatcher {
/**
* Calls before rendering object
*/
onBeforeRender: (
renderer: WebGLRenderer,
onBeforeRender: <Renderer = WebGLRenderer>(
renderer: Renderer,
scene: Scene,
camera: Camera,
geometry: Geometry | BufferGeometry,
@@ -165,8 +165,8 @@ export class Object3D extends EventDispatcher {
/**
* Calls after rendering object
*/
onAfterRender: (
renderer: WebGLRenderer,
onAfterRender: <Renderer = WebGLRenderer>(
renderer: Renderer,
scene: Scene,
camera: Camera,
geometry: Geometry | BufferGeometry,