Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/core/Object3D.js
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ class Object3D extends EventDispatcher {
* This method does not support objects having non-uniformly-scaled parent(s).
*
* @param {number|Vector3} x - The x coordinate in world space. Alternatively, a vector representing a position in world space
* @param {number} y - The y coordinate in world space.
* @param {number} z - The z coordinate in world space.
* @param {number} [y] - The y coordinate in world space.
* @param {number} [z] - The z coordinate in world space.
*/
lookAt( x, y, z ) {

Expand Down Expand Up @@ -1162,7 +1162,8 @@ class Object3D extends EventDispatcher {
* Serializes the 3D object into JSON.
*
* @param {?(Object|String)} meta - An optional value holding meta information about the serialization.
* @return {Object} The JSON.
* @return {Object} A JSON object representing the serialized 3D object.
* @see {@link ObjectLoader#parse}
*/
toJSON( meta ) {

Expand Down