Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[next] Reorganized mesh classes #4963

Merged
merged 2 commits into from Jun 10, 2018
Merged

[next] Reorganized mesh classes #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce8c26e
Reorganized mesh classes
bigtimebuddy Jun 10, 2018
ce65762
Merge branch 'next' into next-mesh-reorg
bigtimebuddy Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bundles/pixi.js/package.json
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@
"@pixi/loaders": "^5.0.0-alpha.2",
"@pixi/math": "^5.0.0-alpha.2",
"@pixi/mesh": "^5.0.0-alpha.2",
"@pixi/mesh-extras": "^5.0.0-alpha.2",
"@pixi/mixin-cache-as-bitmap": "^5.0.0-alpha.2",
"@pixi/mixin-get-child-by-name": "^5.0.0-alpha.2",
"@pixi/mixin-get-global-position": "^5.0.0-alpha.2",
Expand Down
12 changes: 6 additions & 6 deletions bundles/pixi.js/src/deprecated.js
View file
Open in desktop
Expand Up @@ -263,15 +263,15 @@ export default function deprecated(PIXI)
Object.defineProperties(PIXI.mesh, {
/**
* @class PIXI.mesh.Mesh
* @see PIXI.Mesh
* @see PIXI.Mesh2d
* @deprecated since 5.0.0
*/
Mesh: {
get()
{
warn('PIXI.mesh.Mesh has moved to PIXI.Mesh');
warn('PIXI.mesh.Mesh has moved to PIXI.Mesh2d');

return PIXI.Mesh;
return PIXI.Mesh2d;
},
},
/**
Expand Down Expand Up @@ -315,15 +315,15 @@ export default function deprecated(PIXI)
},
/**
* @class PIXI.mesh.RawMesh
* @see PIXI.RawMesh
* @see PIXI.Mesh
* @deprecated since 5.0.0
*/
RawMesh: {
get()
{
warn('PIXI.mesh.RawMesh has moved to PIXI.RawMesh');
warn('PIXI.mesh.RawMesh has moved to PIXI.Mesh');

return PIXI.RawMesh;
return PIXI.Mesh;
},
},
/**
Expand Down
3 changes: 3 additions & 0 deletions bundles/pixi.js/src/index.js
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import * as interaction from '@pixi/interaction';
import * as loaders from '@pixi/loaders';
import * as math from '@pixi/math';
import * as mesh from '@pixi/mesh';
import * as meshExtras from '@pixi/mesh-extras';
import * as particles from '@pixi/particles';
import * as prepare from '@pixi/prepare';
import * as sprite from '@pixi/sprite';
Expand Down Expand Up @@ -128,6 +129,7 @@ if (typeof window !== 'undefined')
loaders,
math,
mesh,
meshExtras,
particles,
sprite,
spriteAnimated,
Expand All @@ -152,6 +154,7 @@ export * from '@pixi/graphics';
export * from '@pixi/loaders';
export * from '@pixi/math';
export * from '@pixi/mesh';
export * from '@pixi/mesh-extras';
export * from '@pixi/particles';
export * from '@pixi/sprite';
export * from '@pixi/spritesheet';
Expand Down