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: 20ad44c2b651ee5ce539051ed9729da5fb0a6c65
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: 4b186eb630834c288ee2ff73f57e41bbdf5536c4
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 30, 2020

  1. Updated package.json

    mrdoob committed Jan 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    ce5ef24 View commit details
  2. Copy the full SHA
    b536e31 View commit details

Commits on Jan 31, 2020

  1. Merge pull request #18520 from juliendargelos/css3object-generic-rend…

    …erer
    
    CSS2DObject and CSS3DObject: Remove broken generics and make renderer parameter unknown
    mrdoob authored Jan 31, 2020
    Copy the full SHA
    4b186eb View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 examples/jsm/renderers/CSS2DRenderer.d.ts
  2. +2 −2 examples/jsm/renderers/CSS3DRenderer.d.ts
  3. +1 −1 package.json
  4. +4 −4 src/core/Object3D.d.ts
4 changes: 2 additions & 2 deletions examples/jsm/renderers/CSS2DRenderer.d.ts
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>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onAfterRender: <Renderer = CSS2DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onBeforeRender: (renderer: unknown, scene: Scene, camera: Camera) => void;
onAfterRender: (renderer: unknown, scene: Scene, camera: Camera) => void;

}

4 changes: 2 additions & 2 deletions examples/jsm/renderers/CSS3DRenderer.d.ts
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>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onAfterRender: <Renderer = CSS3DRenderer>(renderer: Renderer, scene: Scene, camera: Camera) => void;
onBeforeRender: (renderer: unknown, scene: Scene, camera: Camera) => void;
onAfterRender: (renderer: unknown, scene: Scene, camera: Camera) => void;

}

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "three",
"version": "0.113.0",
"version": "0.113.1",
"description": "JavaScript 3D library",
"main": "build/three.js",
"module": "build/three.module.js",
8 changes: 4 additions & 4 deletions src/core/Object3D.d.ts
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>(
renderer: Renderer,
onBeforeRender: (
renderer: WebGLRenderer,
scene: Scene,
camera: Camera,
geometry: Geometry | BufferGeometry,
@@ -165,8 +165,8 @@ export class Object3D extends EventDispatcher {
/**
* Calls after rendering object
*/
onAfterRender: <Renderer = WebGLRenderer>(
renderer: Renderer,
onAfterRender: (
renderer: WebGLRenderer,
scene: Scene,
camera: Camera,
geometry: Geometry | BufferGeometry,