Skip to content

Commit

Permalink
Merge branch 'dev' into dev-depth-rev
Browse files Browse the repository at this point in the history
  • Loading branch information
sunag committed Dec 11, 2024
1 parent 81bf768 commit 1646103
Show file tree
Hide file tree
Showing 113 changed files with 1,826 additions and 518 deletions.
10 changes: 5 additions & 5 deletions editor/js/commands/AddObjectCommand.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Command } from '../Command.js';
import { ObjectLoader } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @constructor
*/
class AddObjectCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @constructor
*/
constructor( editor, object = null ) {

super( editor );
Expand Down
12 changes: 6 additions & 6 deletions editor/js/commands/AddScriptCommand.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param script javascript object
* @constructor
*/
class AddScriptCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [script='']
* @constructor
*/
constructor( editor, object = null, script = '' ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/MoveObjectCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newParent THREE.Object3D
* @param newBefore THREE.Object3D
* @constructor
*/
class MoveObjectCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {THREE.Object3D|null} [newParent=null]
* @param {THREE.Object3D|null} [newBefore=null]
* @constructor
*/
constructor( editor, object = null, newParent = null, newBefore = null ) {

super( editor );
Expand Down
10 changes: 5 additions & 5 deletions editor/js/commands/MultiCmdsCommand.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param cmdArray array containing command objects
* @constructor
*/
class MultiCmdsCommand extends Command {

/**
* @param {Editor} editor
* @param {Array<Command>} [cmdArray=[]]
* @constructor
*/
constructor( editor, cmdArray = [] ) {

super( editor );
Expand Down
10 changes: 5 additions & 5 deletions editor/js/commands/RemoveObjectCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { Command } from '../Command.js';

import { ObjectLoader } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @constructor
*/
class RemoveObjectCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @constructor
*/
constructor( editor, object = null ) {

super( editor );
Expand Down
12 changes: 6 additions & 6 deletions editor/js/commands/RemoveScriptCommand.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param script javascript object
* @constructor
*/
class RemoveScriptCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [script='']
* @constructor
*/
constructor( editor, object = null, script = '' ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/SetColorCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param attributeName string
* @param newValue integer representing a hex color value
* @constructor
*/
class SetColorCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} attributeName
* @param {Number|null} [newValue=null] Integer representing a hex color value
* @constructor
*/
constructor( editor, object = null, attributeName = '', newValue = null ) {

super( editor );
Expand Down
13 changes: 6 additions & 7 deletions editor/js/commands/SetGeometryCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Command } from '../Command.js';
import { ObjectLoader } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newGeometry THREE.Geometry
* @constructor
*/

class SetGeometryCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {THREE.Geometry|null} [newGeometry=null]
* @constructor
*/
constructor( editor, object = null, newGeometry = null ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/SetGeometryValueCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param attributeName string
* @param newValue number, string, boolean or object
* @constructor
*/
class SetGeometryValueCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [attributeName='']
* @param {Number|String|Boolean|Object|null} [newValue=null]
* @constructor
*/
constructor( editor, object = null, attributeName = '', newValue = null ) {

super( editor );
Expand Down
15 changes: 8 additions & 7 deletions editor/js/commands/SetMaterialColorCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param attributeName string
* @param newValue integer representing a hex color value
* @constructor
*/
class SetMaterialColorCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} attributeName
* @param {Number|null} [newValue=null] Integer representing a hex color value
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {

super( editor );
Expand Down
13 changes: 7 additions & 6 deletions editor/js/commands/SetMaterialCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Command } from '../Command.js';
import { ObjectLoader } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newMaterial THREE.Material
* @constructor
*/
class SetMaterialCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} object
* @param {THREE.Material|null} newMaterial
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, newMaterial = null, materialSlot = - 1 ) {

super( editor );
Expand Down
15 changes: 8 additions & 7 deletions editor/js/commands/SetMaterialMapCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Command } from '../Command.js';
import { ObjectLoader } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param mapName string
* @param newMap THREE.Texture
* @constructor
*/
class SetMaterialMapCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [mapName='']
* @param {THREE.Texture|null} [newMap=null]
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, mapName = '', newMap = null, materialSlot = - 1 ) {

super( editor );
Expand Down
17 changes: 9 additions & 8 deletions editor/js/commands/SetMaterialRangeCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param attributeName string
* @param newMinValue number
* @param newMaxValue number
* @constructor
*/
class SetMaterialRangeCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [attributeName='']
* @param {Number} [newMinValue=-Infinity]
* @param {Number} [newMaxValue=Infinity]
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, attributeName = '', newMinValue = - Infinity, newMaxValue = Infinity, materialSlot = - 1 ) {

super( editor );
Expand Down
15 changes: 8 additions & 7 deletions editor/js/commands/SetMaterialValueCommand.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { Command } from '../Command.js';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param attributeName string
* @param newValue number, string, boolean or object
* @constructor
*/
class SetMaterialValueCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [attributeName='']
* @param {Number|String|Boolean|Object|null} [newValue=null]
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {

super( editor );
Expand Down
9 changes: 9 additions & 0 deletions editor/js/commands/SetMaterialVectorCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ import { Command } from '../Command.js';

class SetMaterialVectorCommand extends Command {

/**
*
* @param {Editor} editor
* @param {THREE.Object3D|null} [object=null]
* @param {String} [attributeName='']
* @param {THREE.Vector2|THREE.Vector3|THREE.Vector4|null} [newValue=null]
* @param {Number} [materialSlot=-1]
* @constructor
*/
constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/SetPositionCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Command } from '../Command.js';
import { Vector3 } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newPosition THREE.Vector3
* @param optionalOldPosition THREE.Vector3
* @constructor
*/
class SetPositionCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} object
* @param {THREE.Vector3|null} newPosition
* @param {THREE.Vector3|null} optionalOldPosition
* @constructor
*/
constructor( editor, object = null, newPosition = null, optionalOldPosition = null ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/SetRotationCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Command } from '../Command.js';
import { Euler } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newRotation THREE.Euler
* @param optionalOldRotation THREE.Euler
* @constructor
*/
class SetRotationCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} object
* @param {THREE.Euler|null} newRotation
* @param {THREE.Euler|null} optionalOldRotation
* @constructor
*/
constructor( editor, object = null, newRotation = null, optionalOldRotation = null ) {

super( editor );
Expand Down
14 changes: 7 additions & 7 deletions editor/js/commands/SetScaleCommand.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Command } from '../Command.js';
import { Vector3 } from 'three';

/**
* @param editor Editor
* @param object THREE.Object3D
* @param newScale THREE.Vector3
* @param optionalOldScale THREE.Vector3
* @constructor
*/
class SetScaleCommand extends Command {

/**
* @param {Editor} editor
* @param {THREE.Object3D|null} object
* @param {THREE.Vector3|null} newScale
* @param {THREE.Vector3|null} optionalOldScale
* @constructor
*/
constructor( editor, object = null, newScale = null, optionalOldScale = null ) {

super( editor );
Expand Down
Loading

0 comments on commit 1646103

Please sign in to comment.