diff --git a/spine-as3/spine-as3/src/spine/SkeletonBinary.as b/spine-as3/spine-as3/src/spine/SkeletonBinary.as index 274622a32..cf4909516 100644 --- a/spine-as3/spine-as3/src/spine/SkeletonBinary.as +++ b/spine-as3/spine-as3/src/spine/SkeletonBinary.as @@ -933,7 +933,7 @@ package spine { deform.length = deformLength; } else deform = vertices; - } else { + } else { var v : int, vn: int; deform = new Vector.(); deform.length = deformLength; diff --git a/spine-as3/spine-as3/src/spine/Vertex.as b/spine-as3/spine-as3/src/spine/Vertex.as index 57e32fb9d..738c9ef03 100644 --- a/spine-as3/spine-as3/src/spine/Vertex.as +++ b/spine-as3/spine-as3/src/spine/Vertex.as @@ -39,6 +39,6 @@ package spine { public var light : Color = new spine.Color(0, 0, 0); public var dark : Color = new spine.Color(0, 0, 0); - function Vertex() { } + function Vertex() { } } } diff --git a/spine-as3/spine-as3/src/spine/animation/AnimationState.as b/spine-as3/spine-as3/src/spine/animation/AnimationState.as index 8ca928756..88926ec44 100644 --- a/spine-as3/spine-as3/src/spine/animation/AnimationState.as +++ b/spine-as3/spine-as3/src/spine/animation/AnimationState.as @@ -658,7 +658,7 @@ package spine.animation { else if (to == null || timeline is AttachmentTimeline || timeline is DrawOrderTimeline || timeline is EventTimeline || !to.animation.hasTimeline(ids)) { timelineMode[i] = FIRST; - } else { + } else { for (var next : TrackEntry = to.mixingTo; next != null; next = next.mixingTo) { if (next.animation.hasTimeline(ids)) continue; if (entry.mixDuration > 0) { diff --git a/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as b/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as index 29371c37e..1e1a6f1df 100644 --- a/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as @@ -183,7 +183,7 @@ package spine.animation { for (i = 0; i < vertexCount; i++) deform[i] = lastVertices[i]; } - } else { + } else { switch (blend) { case MixBlend.setup: { if (vertexAttachment.bones == null) { diff --git a/spine-as3/spine-as3/src/spine/animation/RGBTimeline.as b/spine-as3/spine-as3/src/spine/animation/RGBTimeline.as index ef945545b..371f7894f 100644 --- a/spine-as3/spine-as3/src/spine/animation/RGBTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/RGBTimeline.as @@ -115,7 +115,7 @@ package spine.animation { color.r = r; color.g = g; color.b = b; - } else { + } else { if (blend == MixBlend.setup) { setup = slot.data.color; color.r = setup.r; diff --git a/spine-ts/core/src/Animation.ts b/spine-ts/core/src/Animation.ts index 28f3fdeb2..27266b798 100644 --- a/spine-ts/core/src/Animation.ts +++ b/spine-ts/core/src/Animation.ts @@ -1088,7 +1088,7 @@ module spine { color.r = r; color.g = g; color.b = b; - } else { + } else { if (blend == MixBlend.setup) { let setup = slot.data.color; color.r = setup.r; @@ -1560,7 +1560,7 @@ module spine { } } else Utils.arrayCopy(lastVertices, 0, deform, 0, vertexCount); - } else { + } else { switch (blend) { case MixBlend.setup: { let vertexAttachment = slotAttachment as VertexAttachment; diff --git a/spine-ts/core/src/AnimationState.ts b/spine-ts/core/src/AnimationState.ts index 9d0d443df..209e76acc 100644 --- a/spine-ts/core/src/AnimationState.ts +++ b/spine-ts/core/src/AnimationState.ts @@ -720,7 +720,7 @@ module spine { else if (!to || timeline instanceof AttachmentTimeline || timeline instanceof DrawOrderTimeline || timeline instanceof EventTimeline || !to.animation.hasTimeline(ids)) { timelineMode[i] = FIRST; - } else { + } else { for (let next = to.mixingTo; next; next = next.mixingTo) { if (next.animation.hasTimeline(ids)) continue; if (entry.mixDuration > 0) { diff --git a/spine-ts/core/src/Skeleton.ts b/spine-ts/core/src/Skeleton.ts index 7fc759fc9..41d549043 100644 --- a/spine-ts/core/src/Skeleton.ts +++ b/spine-ts/core/src/Skeleton.ts @@ -610,7 +610,7 @@ module spine { verticesLength = 8; vertices = Utils.setArraySize(temp, verticesLength, 0); (attachment).computeWorldVertices(slot.bone, vertices, 0, 2); - } else if (attachment instanceof MeshAttachment) { + } else if (attachment instanceof MeshAttachment) { let mesh = (attachment); verticesLength = mesh.worldVerticesLength; vertices = Utils.setArraySize(temp, verticesLength, 0); diff --git a/spine-ts/core/src/SkeletonBinary.ts b/spine-ts/core/src/SkeletonBinary.ts index 8244149a1..8806eb301 100644 --- a/spine-ts/core/src/SkeletonBinary.ts +++ b/spine-ts/core/src/SkeletonBinary.ts @@ -946,7 +946,7 @@ module spine { } class BinaryInput { - constructor(data: Uint8Array, public strings = new Array(), private index: number = 0, private buffer = new DataView(data.buffer)) {  + constructor(data: Uint8Array, public strings = new Array(), private index: number = 0, private buffer = new DataView(data.buffer)) { } readByte(): number { diff --git a/spine-ts/player/src/Player.ts b/spine-ts/player/src/Player.ts index e0c2a0670..fcb9bddb9 100644 --- a/spine-ts/player/src/Player.ts +++ b/spine-ts/player/src/Player.ts @@ -1103,7 +1103,7 @@ module spine { private knob: HTMLElement; public change: (percentage: number) => void; - constructor (public snaps = 0, public snapPercentage = 0.1, public big = false) { } + constructor (public snaps = 0, public snapPercentage = 0.1, public big = false) { } create (): HTMLElement { this.slider = createElement(/*html*/` diff --git a/spine-ts/threejs/src/threejs/audio/Audio.d.ts b/spine-ts/threejs/src/threejs/audio/Audio.d.ts index e89afe9de..938682846 100644 --- a/spine-ts/threejs/src/threejs/audio/Audio.d.ts +++ b/spine-ts/threejs/src/threejs/audio/Audio.d.ts @@ -16,7 +16,7 @@ export class Audio extends Object3D { detune: number; loop: boolean; offset: number; - duration: number | undefined; + duration: number | undefined; playbackRate: number; isPlaying: boolean; hasPlaybackControl: boolean; diff --git a/spine-ts/threejs/src/threejs/materials/MeshDepthMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshDepthMaterial.d.ts index 3609b9161..ad4fea3f9 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshDepthMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshDepthMaterial.d.ts @@ -3,9 +3,9 @@ import { MaterialParameters, Material } from './Material'; import { Texture } from './../textures/Texture'; export interface MeshDepthMaterialParameters extends MaterialParameters { - alphaMap?: Texture | null; + alphaMap?: Texture | null; depthPacking?: DepthPackingStrategies; - displacementMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; wireframe?: boolean; @@ -16,7 +16,7 @@ export class MeshDepthMaterial extends Material { constructor( parameters?: MeshDepthMaterialParameters ); - alphaMap: Texture | null; + alphaMap: Texture | null; depthPacking: DepthPackingStrategies; displacementMap: Texture | null; displacementScale: number; diff --git a/spine-ts/threejs/src/threejs/materials/MeshDistanceMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshDistanceMaterial.d.ts index 54a3265c4..3f3832d0c 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshDistanceMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshDistanceMaterial.d.ts @@ -3,8 +3,8 @@ import { Vector3 } from './../math/Vector3'; import { Texture } from './../textures/Texture'; export interface MeshDistanceMaterialParameters extends MaterialParameters { - alphaMap?: Texture | null; - displacementMap?: Texture | null; + alphaMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; farDistance?: number; @@ -16,7 +16,7 @@ export class MeshDistanceMaterial extends Material { constructor( parameters?: MeshDistanceMaterialParameters ); - alphaMap: Texture | null; + alphaMap: Texture | null; displacementMap: Texture | null; displacementScale: number; displacementBias: number; diff --git a/spine-ts/threejs/src/threejs/materials/MeshLambertMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshLambertMaterial.d.ts index 787c578bf..81a1d7bec 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshLambertMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshLambertMaterial.d.ts @@ -7,15 +7,15 @@ export interface MeshLambertMaterialParameters extends MaterialParameters { color?: Color | string | number; emissive?: Color | string | number; emissiveIntensity?: number; - emissiveMap?: Texture | null; - map?: Texture | null; - lightMap?: Texture | null; + emissiveMap?: Texture | null; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture | null; + aoMap?: Texture | null; aoMapIntensity?: number; - specularMap?: Texture | null; - alphaMap?: Texture | null; - envMap?: Texture | null; + specularMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; combine?: Combine; reflectivity?: number; refractionRatio?: number; diff --git a/spine-ts/threejs/src/threejs/materials/MeshMatcapMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshMatcapMaterial.d.ts index c54263527..52e77e995 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshMatcapMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshMatcapMaterial.d.ts @@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants'; export interface MeshMatcapMaterialParameters extends MaterialParameters { color?: Color | string | number; - matcap?: Texture | null; - map?: Texture | null; - bumpMap?: Texture | null; + matcap?: Texture | null; + map?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture | null; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - alphaMap?: Texture | null; + alphaMap?: Texture | null; skinning?: boolean; morphTargets?: boolean; morphNormals?: boolean; diff --git a/spine-ts/threejs/src/threejs/materials/MeshNormalMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshNormalMaterial.d.ts index 965240c69..d7f71d1b7 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshNormalMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshNormalMaterial.d.ts @@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants'; export interface MeshNormalMaterialParameters extends MaterialParameters { - bumpMap?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture | null; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; wireframe?: boolean; diff --git a/spine-ts/threejs/src/threejs/materials/MeshPhongMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshPhongMaterial.d.ts index afbda6475..f77ba9e47 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshPhongMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshPhongMaterial.d.ts @@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters { specular?: Color | string | number; shininess?: number; opacity?: number; - map?: Texture | null; - lightMap?: Texture | null; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture | null; + aoMap?: Texture | null; aoMapIntensity?: number; emissive?: Color | string | number; emissiveIntensity?: number; - emissiveMap?: Texture | null; - bumpMap?: Texture | null; + emissiveMap?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture | null; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - specularMap?: Texture | null; - alphaMap?: Texture | null; - envMap?: Texture | null; + specularMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; combine?: Combine; reflectivity?: number; refractionRatio?: number; diff --git a/spine-ts/threejs/src/threejs/materials/MeshPhysicalMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshPhysicalMaterial.d.ts index 50aa34cc8..9a33b24ea 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshPhysicalMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshPhysicalMaterial.d.ts @@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters sheen?: Color; clearcoatNormalScale?: Vector2; - clearcoatNormalMap?: Texture | null; + clearcoatNormalMap?: Texture | null; } export class MeshPhysicalMaterial extends MeshStandardMaterial { diff --git a/spine-ts/threejs/src/threejs/materials/MeshStandardMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshStandardMaterial.d.ts index 53aef82a7..c0838fe31 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshStandardMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshStandardMaterial.d.ts @@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters { color?: Color | string | number; roughness?: number; metalness?: number; - map?: Texture | null; - lightMap?: Texture | null; + map?: Texture | null; + lightMap?: Texture | null; lightMapIntensity?: number; - aoMap?: Texture | null; + aoMap?: Texture | null; aoMapIntensity?: number; emissive?: Color | string | number; emissiveIntensity?: number; - emissiveMap?: Texture | null; - bumpMap?: Texture | null; + emissiveMap?: Texture | null; + bumpMap?: Texture | null; bumpScale?: number; - normalMap?: Texture | null; + normalMap?: Texture | null; normalMapType?: NormalMapTypes; normalScale?: Vector2; - displacementMap?: Texture | null; + displacementMap?: Texture | null; displacementScale?: number; displacementBias?: number; - roughnessMap?: Texture | null; - metalnessMap?: Texture | null; - alphaMap?: Texture | null; - envMap?: Texture | null; + roughnessMap?: Texture | null; + metalnessMap?: Texture | null; + alphaMap?: Texture | null; + envMap?: Texture | null; envMapIntensity?: number; refractionRatio?: number; wireframe?: boolean; diff --git a/spine-ts/threejs/src/threejs/materials/MeshToonMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/MeshToonMaterial.d.ts index 6b7192a13..44559c0e2 100644 --- a/spine-ts/threejs/src/threejs/materials/MeshToonMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/MeshToonMaterial.d.ts @@ -2,7 +2,7 @@ import { Texture } from './../textures/Texture'; import { MeshPhongMaterialParameters, MeshPhongMaterial } from './MeshPhongMaterial'; export interface MeshToonMaterialParameters extends MeshPhongMaterialParameters { - gradientMap?: Texture | null; + gradientMap?: Texture | null; } export class MeshToonMaterial extends MeshPhongMaterial { diff --git a/spine-ts/threejs/src/threejs/materials/PointsMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/PointsMaterial.d.ts index dc01327cb..495896bc9 100644 --- a/spine-ts/threejs/src/threejs/materials/PointsMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/PointsMaterial.d.ts @@ -26,7 +26,7 @@ export class MultiMaterial extends Material { export interface PointsMaterialParameters extends MaterialParameters { color?: Color | string | number; map?: Texture | null; - alphaMap?: Texture | null; + alphaMap?: Texture | null; size?: number; sizeAttenuation?: boolean; } diff --git a/spine-ts/threejs/src/threejs/materials/SpriteMaterial.d.ts b/spine-ts/threejs/src/threejs/materials/SpriteMaterial.d.ts index 74416db3a..4a429c29e 100644 --- a/spine-ts/threejs/src/threejs/materials/SpriteMaterial.d.ts +++ b/spine-ts/threejs/src/threejs/materials/SpriteMaterial.d.ts @@ -4,8 +4,8 @@ import { MaterialParameters, Material } from './Material'; export interface SpriteMaterialParameters extends MaterialParameters { color?: Color | string | number; - map?: Texture | null; - alphaMap?: Texture | null; + map?: Texture | null; + alphaMap?: Texture | null; rotation?: number; sizeAttenuation?: boolean; }