mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
NBSP -> space (#1923)
This commit is contained in:
parent
583e6811ff
commit
9541688926
@ -933,7 +933,7 @@ package spine {
|
|||||||
deform.length = deformLength;
|
deform.length = deformLength;
|
||||||
} else
|
} else
|
||||||
deform = vertices;
|
deform = vertices;
|
||||||
} else {
|
} else {
|
||||||
var v : int, vn: int;
|
var v : int, vn: int;
|
||||||
deform = new Vector.<Number>();
|
deform = new Vector.<Number>();
|
||||||
deform.length = deformLength;
|
deform.length = deformLength;
|
||||||
|
|||||||
@ -39,6 +39,6 @@ package spine {
|
|||||||
public var light : Color = new spine.Color(0, 0, 0);
|
public var light : Color = new spine.Color(0, 0, 0);
|
||||||
public var dark : Color = new spine.Color(0, 0, 0);
|
public var dark : Color = new spine.Color(0, 0, 0);
|
||||||
|
|
||||||
function Vertex() { }
|
function Vertex() { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -658,7 +658,7 @@ package spine.animation {
|
|||||||
else if (to == null || timeline is AttachmentTimeline || timeline is DrawOrderTimeline
|
else if (to == null || timeline is AttachmentTimeline || timeline is DrawOrderTimeline
|
||||||
|| timeline is EventTimeline || !to.animation.hasTimeline(ids)) {
|
|| timeline is EventTimeline || !to.animation.hasTimeline(ids)) {
|
||||||
timelineMode[i] = FIRST;
|
timelineMode[i] = FIRST;
|
||||||
} else {
|
} else {
|
||||||
for (var next : TrackEntry = to.mixingTo; next != null; next = next.mixingTo) {
|
for (var next : TrackEntry = to.mixingTo; next != null; next = next.mixingTo) {
|
||||||
if (next.animation.hasTimeline(ids)) continue;
|
if (next.animation.hasTimeline(ids)) continue;
|
||||||
if (entry.mixDuration > 0) {
|
if (entry.mixDuration > 0) {
|
||||||
|
|||||||
@ -183,7 +183,7 @@ package spine.animation {
|
|||||||
for (i = 0; i < vertexCount; i++)
|
for (i = 0; i < vertexCount; i++)
|
||||||
deform[i] = lastVertices[i];
|
deform[i] = lastVertices[i];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (blend) {
|
switch (blend) {
|
||||||
case MixBlend.setup: {
|
case MixBlend.setup: {
|
||||||
if (vertexAttachment.bones == null) {
|
if (vertexAttachment.bones == null) {
|
||||||
|
|||||||
@ -115,7 +115,7 @@ package spine.animation {
|
|||||||
color.r = r;
|
color.r = r;
|
||||||
color.g = g;
|
color.g = g;
|
||||||
color.b = b;
|
color.b = b;
|
||||||
} else {
|
} else {
|
||||||
if (blend == MixBlend.setup) {
|
if (blend == MixBlend.setup) {
|
||||||
setup = slot.data.color;
|
setup = slot.data.color;
|
||||||
color.r = setup.r;
|
color.r = setup.r;
|
||||||
|
|||||||
@ -1088,7 +1088,7 @@ module spine {
|
|||||||
color.r = r;
|
color.r = r;
|
||||||
color.g = g;
|
color.g = g;
|
||||||
color.b = b;
|
color.b = b;
|
||||||
} else {
|
} else {
|
||||||
if (blend == MixBlend.setup) {
|
if (blend == MixBlend.setup) {
|
||||||
let setup = slot.data.color;
|
let setup = slot.data.color;
|
||||||
color.r = setup.r;
|
color.r = setup.r;
|
||||||
@ -1560,7 +1560,7 @@ module spine {
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
Utils.arrayCopy(lastVertices, 0, deform, 0, vertexCount);
|
Utils.arrayCopy(lastVertices, 0, deform, 0, vertexCount);
|
||||||
} else {
|
} else {
|
||||||
switch (blend) {
|
switch (blend) {
|
||||||
case MixBlend.setup: {
|
case MixBlend.setup: {
|
||||||
let vertexAttachment = slotAttachment as VertexAttachment;
|
let vertexAttachment = slotAttachment as VertexAttachment;
|
||||||
|
|||||||
@ -720,7 +720,7 @@ module spine {
|
|||||||
else if (!to || timeline instanceof AttachmentTimeline || timeline instanceof DrawOrderTimeline
|
else if (!to || timeline instanceof AttachmentTimeline || timeline instanceof DrawOrderTimeline
|
||||||
|| timeline instanceof EventTimeline || !to.animation.hasTimeline(ids)) {
|
|| timeline instanceof EventTimeline || !to.animation.hasTimeline(ids)) {
|
||||||
timelineMode[i] = FIRST;
|
timelineMode[i] = FIRST;
|
||||||
} else {
|
} else {
|
||||||
for (let next = to.mixingTo; next; next = next.mixingTo) {
|
for (let next = to.mixingTo; next; next = next.mixingTo) {
|
||||||
if (next.animation.hasTimeline(ids)) continue;
|
if (next.animation.hasTimeline(ids)) continue;
|
||||||
if (entry.mixDuration > 0) {
|
if (entry.mixDuration > 0) {
|
||||||
|
|||||||
@ -610,7 +610,7 @@ module spine {
|
|||||||
verticesLength = 8;
|
verticesLength = 8;
|
||||||
vertices = Utils.setArraySize(temp, verticesLength, 0);
|
vertices = Utils.setArraySize(temp, verticesLength, 0);
|
||||||
(<RegionAttachment>attachment).computeWorldVertices(slot.bone, vertices, 0, 2);
|
(<RegionAttachment>attachment).computeWorldVertices(slot.bone, vertices, 0, 2);
|
||||||
} else if (attachment instanceof MeshAttachment) {
|
} else if (attachment instanceof MeshAttachment) {
|
||||||
let mesh = (<MeshAttachment>attachment);
|
let mesh = (<MeshAttachment>attachment);
|
||||||
verticesLength = mesh.worldVerticesLength;
|
verticesLength = mesh.worldVerticesLength;
|
||||||
vertices = Utils.setArraySize(temp, verticesLength, 0);
|
vertices = Utils.setArraySize(temp, verticesLength, 0);
|
||||||
|
|||||||
@ -946,7 +946,7 @@ module spine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class BinaryInput {
|
class BinaryInput {
|
||||||
constructor(data: Uint8Array, public strings = new Array<string>(), private index: number = 0, private buffer = new DataView(data.buffer)) {
|
constructor(data: Uint8Array, public strings = new Array<string>(), private index: number = 0, private buffer = new DataView(data.buffer)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
readByte(): number {
|
readByte(): number {
|
||||||
|
|||||||
@ -1103,7 +1103,7 @@ module spine {
|
|||||||
private knob: HTMLElement;
|
private knob: HTMLElement;
|
||||||
public change: (percentage: number) => void;
|
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 {
|
create (): HTMLElement {
|
||||||
this.slider = createElement(/*html*/`
|
this.slider = createElement(/*html*/`
|
||||||
|
|||||||
@ -16,7 +16,7 @@ export class Audio extends Object3D {
|
|||||||
detune: number;
|
detune: number;
|
||||||
loop: boolean;
|
loop: boolean;
|
||||||
offset: number;
|
offset: number;
|
||||||
duration: number | undefined;
|
duration: number | undefined;
|
||||||
playbackRate: number;
|
playbackRate: number;
|
||||||
isPlaying: boolean;
|
isPlaying: boolean;
|
||||||
hasPlaybackControl: boolean;
|
hasPlaybackControl: boolean;
|
||||||
|
|||||||
@ -3,9 +3,9 @@ import { MaterialParameters, Material } from './Material';
|
|||||||
import { Texture } from './../textures/Texture';
|
import { Texture } from './../textures/Texture';
|
||||||
|
|
||||||
export interface MeshDepthMaterialParameters extends MaterialParameters {
|
export interface MeshDepthMaterialParameters extends MaterialParameters {
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
depthPacking?: DepthPackingStrategies;
|
depthPacking?: DepthPackingStrategies;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
wireframe?: boolean;
|
wireframe?: boolean;
|
||||||
@ -16,7 +16,7 @@ export class MeshDepthMaterial extends Material {
|
|||||||
|
|
||||||
constructor( parameters?: MeshDepthMaterialParameters );
|
constructor( parameters?: MeshDepthMaterialParameters );
|
||||||
|
|
||||||
alphaMap: Texture | null;
|
alphaMap: Texture | null;
|
||||||
depthPacking: DepthPackingStrategies;
|
depthPacking: DepthPackingStrategies;
|
||||||
displacementMap: Texture | null;
|
displacementMap: Texture | null;
|
||||||
displacementScale: number;
|
displacementScale: number;
|
||||||
|
|||||||
@ -3,8 +3,8 @@ import { Vector3 } from './../math/Vector3';
|
|||||||
import { Texture } from './../textures/Texture';
|
import { Texture } from './../textures/Texture';
|
||||||
|
|
||||||
export interface MeshDistanceMaterialParameters extends MaterialParameters {
|
export interface MeshDistanceMaterialParameters extends MaterialParameters {
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
farDistance?: number;
|
farDistance?: number;
|
||||||
@ -16,7 +16,7 @@ export class MeshDistanceMaterial extends Material {
|
|||||||
|
|
||||||
constructor( parameters?: MeshDistanceMaterialParameters );
|
constructor( parameters?: MeshDistanceMaterialParameters );
|
||||||
|
|
||||||
alphaMap: Texture | null;
|
alphaMap: Texture | null;
|
||||||
displacementMap: Texture | null;
|
displacementMap: Texture | null;
|
||||||
displacementScale: number;
|
displacementScale: number;
|
||||||
displacementBias: number;
|
displacementBias: number;
|
||||||
|
|||||||
@ -7,15 +7,15 @@ export interface MeshLambertMaterialParameters extends MaterialParameters {
|
|||||||
color?: Color | string | number;
|
color?: Color | string | number;
|
||||||
emissive?: Color | string | number;
|
emissive?: Color | string | number;
|
||||||
emissiveIntensity?: number;
|
emissiveIntensity?: number;
|
||||||
emissiveMap?: Texture | null;
|
emissiveMap?: Texture | null;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
lightMap?: Texture | null;
|
lightMap?: Texture | null;
|
||||||
lightMapIntensity?: number;
|
lightMapIntensity?: number;
|
||||||
aoMap?: Texture | null;
|
aoMap?: Texture | null;
|
||||||
aoMapIntensity?: number;
|
aoMapIntensity?: number;
|
||||||
specularMap?: Texture | null;
|
specularMap?: Texture | null;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
envMap?: Texture | null;
|
envMap?: Texture | null;
|
||||||
combine?: Combine;
|
combine?: Combine;
|
||||||
reflectivity?: number;
|
reflectivity?: number;
|
||||||
refractionRatio?: number;
|
refractionRatio?: number;
|
||||||
|
|||||||
@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants';
|
|||||||
export interface MeshMatcapMaterialParameters extends MaterialParameters {
|
export interface MeshMatcapMaterialParameters extends MaterialParameters {
|
||||||
|
|
||||||
color?: Color | string | number;
|
color?: Color | string | number;
|
||||||
matcap?: Texture | null;
|
matcap?: Texture | null;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
bumpMap?: Texture | null;
|
bumpMap?: Texture | null;
|
||||||
bumpScale?: number;
|
bumpScale?: number;
|
||||||
normalMap?: Texture | null;
|
normalMap?: Texture | null;
|
||||||
normalMapType?: NormalMapTypes;
|
normalMapType?: NormalMapTypes;
|
||||||
normalScale?: Vector2;
|
normalScale?: Vector2;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
skinning?: boolean;
|
skinning?: boolean;
|
||||||
morphTargets?: boolean;
|
morphTargets?: boolean;
|
||||||
morphNormals?: boolean;
|
morphNormals?: boolean;
|
||||||
|
|||||||
@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants';
|
|||||||
|
|
||||||
export interface MeshNormalMaterialParameters extends MaterialParameters {
|
export interface MeshNormalMaterialParameters extends MaterialParameters {
|
||||||
|
|
||||||
bumpMap?: Texture | null;
|
bumpMap?: Texture | null;
|
||||||
bumpScale?: number;
|
bumpScale?: number;
|
||||||
normalMap?: Texture | null;
|
normalMap?: Texture | null;
|
||||||
normalMapType?: NormalMapTypes;
|
normalMapType?: NormalMapTypes;
|
||||||
normalScale?: Vector2;
|
normalScale?: Vector2;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
wireframe?: boolean;
|
wireframe?: boolean;
|
||||||
|
|||||||
@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
|
|||||||
specular?: Color | string | number;
|
specular?: Color | string | number;
|
||||||
shininess?: number;
|
shininess?: number;
|
||||||
opacity?: number;
|
opacity?: number;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
lightMap?: Texture | null;
|
lightMap?: Texture | null;
|
||||||
lightMapIntensity?: number;
|
lightMapIntensity?: number;
|
||||||
aoMap?: Texture | null;
|
aoMap?: Texture | null;
|
||||||
aoMapIntensity?: number;
|
aoMapIntensity?: number;
|
||||||
emissive?: Color | string | number;
|
emissive?: Color | string | number;
|
||||||
emissiveIntensity?: number;
|
emissiveIntensity?: number;
|
||||||
emissiveMap?: Texture | null;
|
emissiveMap?: Texture | null;
|
||||||
bumpMap?: Texture | null;
|
bumpMap?: Texture | null;
|
||||||
bumpScale?: number;
|
bumpScale?: number;
|
||||||
normalMap?: Texture | null;
|
normalMap?: Texture | null;
|
||||||
normalMapType?: NormalMapTypes;
|
normalMapType?: NormalMapTypes;
|
||||||
normalScale?: Vector2;
|
normalScale?: Vector2;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
specularMap?: Texture | null;
|
specularMap?: Texture | null;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
envMap?: Texture | null;
|
envMap?: Texture | null;
|
||||||
combine?: Combine;
|
combine?: Combine;
|
||||||
reflectivity?: number;
|
reflectivity?: number;
|
||||||
refractionRatio?: number;
|
refractionRatio?: number;
|
||||||
|
|||||||
@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters
|
|||||||
sheen?: Color;
|
sheen?: Color;
|
||||||
|
|
||||||
clearcoatNormalScale?: Vector2;
|
clearcoatNormalScale?: Vector2;
|
||||||
clearcoatNormalMap?: Texture | null;
|
clearcoatNormalMap?: Texture | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class MeshPhysicalMaterial extends MeshStandardMaterial {
|
export class MeshPhysicalMaterial extends MeshStandardMaterial {
|
||||||
|
|||||||
@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
|
|||||||
color?: Color | string | number;
|
color?: Color | string | number;
|
||||||
roughness?: number;
|
roughness?: number;
|
||||||
metalness?: number;
|
metalness?: number;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
lightMap?: Texture | null;
|
lightMap?: Texture | null;
|
||||||
lightMapIntensity?: number;
|
lightMapIntensity?: number;
|
||||||
aoMap?: Texture | null;
|
aoMap?: Texture | null;
|
||||||
aoMapIntensity?: number;
|
aoMapIntensity?: number;
|
||||||
emissive?: Color | string | number;
|
emissive?: Color | string | number;
|
||||||
emissiveIntensity?: number;
|
emissiveIntensity?: number;
|
||||||
emissiveMap?: Texture | null;
|
emissiveMap?: Texture | null;
|
||||||
bumpMap?: Texture | null;
|
bumpMap?: Texture | null;
|
||||||
bumpScale?: number;
|
bumpScale?: number;
|
||||||
normalMap?: Texture | null;
|
normalMap?: Texture | null;
|
||||||
normalMapType?: NormalMapTypes;
|
normalMapType?: NormalMapTypes;
|
||||||
normalScale?: Vector2;
|
normalScale?: Vector2;
|
||||||
displacementMap?: Texture | null;
|
displacementMap?: Texture | null;
|
||||||
displacementScale?: number;
|
displacementScale?: number;
|
||||||
displacementBias?: number;
|
displacementBias?: number;
|
||||||
roughnessMap?: Texture | null;
|
roughnessMap?: Texture | null;
|
||||||
metalnessMap?: Texture | null;
|
metalnessMap?: Texture | null;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
envMap?: Texture | null;
|
envMap?: Texture | null;
|
||||||
envMapIntensity?: number;
|
envMapIntensity?: number;
|
||||||
refractionRatio?: number;
|
refractionRatio?: number;
|
||||||
wireframe?: boolean;
|
wireframe?: boolean;
|
||||||
|
|||||||
@ -2,7 +2,7 @@ import { Texture } from './../textures/Texture';
|
|||||||
import { MeshPhongMaterialParameters, MeshPhongMaterial } from './MeshPhongMaterial';
|
import { MeshPhongMaterialParameters, MeshPhongMaterial } from './MeshPhongMaterial';
|
||||||
|
|
||||||
export interface MeshToonMaterialParameters extends MeshPhongMaterialParameters {
|
export interface MeshToonMaterialParameters extends MeshPhongMaterialParameters {
|
||||||
gradientMap?: Texture | null;
|
gradientMap?: Texture | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class MeshToonMaterial extends MeshPhongMaterial {
|
export class MeshToonMaterial extends MeshPhongMaterial {
|
||||||
|
|||||||
@ -26,7 +26,7 @@ export class MultiMaterial extends Material {
|
|||||||
export interface PointsMaterialParameters extends MaterialParameters {
|
export interface PointsMaterialParameters extends MaterialParameters {
|
||||||
color?: Color | string | number;
|
color?: Color | string | number;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
size?: number;
|
size?: number;
|
||||||
sizeAttenuation?: boolean;
|
sizeAttenuation?: boolean;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,8 +4,8 @@ import { MaterialParameters, Material } from './Material';
|
|||||||
|
|
||||||
export interface SpriteMaterialParameters extends MaterialParameters {
|
export interface SpriteMaterialParameters extends MaterialParameters {
|
||||||
color?: Color | string | number;
|
color?: Color | string | number;
|
||||||
map?: Texture | null;
|
map?: Texture | null;
|
||||||
alphaMap?: Texture | null;
|
alphaMap?: Texture | null;
|
||||||
rotation?: number;
|
rotation?: number;
|
||||||
sizeAttenuation?: boolean;
|
sizeAttenuation?: boolean;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user