Prettified all files.
This commit is contained in:
+123
-75
@@ -1444,7 +1444,7 @@ import Theme from './theme.js'
|
||||
import Progress from './progress.js'
|
||||
import Modal from './modal.js'
|
||||
import Message from './message.js'
|
||||
import {debounce} from '../utils.js'
|
||||
import { debounce } from '../utils.js'
|
||||
|
||||
/**
|
||||
* A special InteractionManager for fullscreen apps, which may
|
||||
@@ -1461,7 +1461,6 @@ import {debounce} from '../utils.js'
|
||||
* @see {@link https://stackoverflow.com/questions/29710696/webgl-drawing-buffer-size-does-not-equal-canvas-size}
|
||||
*/
|
||||
class FullscreenInteractionManager extends PIXI.interaction.InteractionManager {
|
||||
|
||||
mapPositionToPoint(point, x, y) {
|
||||
let resolution = this.renderer.resolution
|
||||
let extendWidth = 1.0
|
||||
@@ -1469,8 +1468,10 @@ class FullscreenInteractionManager extends PIXI.interaction.InteractionManager {
|
||||
let dy = 0
|
||||
let canvas = this.renderer.view
|
||||
let context = canvas.getContext('webgl')
|
||||
if (context.drawingBufferWidth < canvas.width ||
|
||||
context.drawingBufferHeight < canvas.height) {
|
||||
if (
|
||||
context.drawingBufferWidth < canvas.width ||
|
||||
context.drawingBufferHeight < canvas.height
|
||||
) {
|
||||
extendWidth = context.drawingBufferWidth / canvas.width
|
||||
extendHeight = context.drawingBufferHeight / canvas.height
|
||||
//dx = wantedWidth - context.drawingBufferWidth
|
||||
@@ -1503,7 +1504,6 @@ class FullscreenInteractionManager extends PIXI.interaction.InteractionManager {
|
||||
* @see {@link http://pixijs.download/dev/docs/PIXI.Application.html|PIXI.Application}
|
||||
*/
|
||||
export default class PIXIApp extends PIXI.Application {
|
||||
|
||||
/**
|
||||
* Creates an instance of a PixiApp.
|
||||
*
|
||||
@@ -1526,12 +1526,23 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {boolean} [opts.adaptive=true] - Adds Graphics adaptive calculation of quadratic curve and arc subdivision.
|
||||
*/
|
||||
constructor({
|
||||
width = null, height = null, view = null,
|
||||
transparent = true, backgroundColor = 0x282828, theme = 'dark',
|
||||
antialias = true, resolution = window.devicePixelRatio || 1, autoResize = true,
|
||||
fpsLogging = false, progress = {}, forceCanvas = false, roundPixels = true, monkeyPatchMapping = true, adaptive = true,
|
||||
graphql = false }) {
|
||||
|
||||
width = null,
|
||||
height = null,
|
||||
view = null,
|
||||
transparent = true,
|
||||
backgroundColor = 0x282828,
|
||||
theme = 'dark',
|
||||
antialias = true,
|
||||
resolution = window.devicePixelRatio || 1,
|
||||
autoResize = true,
|
||||
fpsLogging = false,
|
||||
progress = {},
|
||||
forceCanvas = false,
|
||||
roundPixels = true,
|
||||
monkeyPatchMapping = true,
|
||||
adaptive = true,
|
||||
graphql = false
|
||||
}) {
|
||||
const fullScreen = !width || !height
|
||||
|
||||
if (fullScreen) {
|
||||
@@ -1549,7 +1560,7 @@ export default class PIXIApp extends PIXI.Application {
|
||||
autoResize,
|
||||
backgroundColor,
|
||||
forceCanvas,
|
||||
roundPixels // not needed for PixiJS >= 5
|
||||
roundPixels // not needed for PixiJS >= 5
|
||||
})
|
||||
|
||||
this.width = width
|
||||
@@ -1572,7 +1583,10 @@ export default class PIXIApp extends PIXI.Application {
|
||||
console.log('App is in fullScreen mode or autoResize mode')
|
||||
const resizeDebounced = debounce(event => this.resize(event), 50)
|
||||
window.addEventListener('resize', resizeDebounced)
|
||||
document.body.addEventListener('orientationchange', this.checkOrientation.bind(this))
|
||||
document.body.addEventListener(
|
||||
'orientationchange',
|
||||
this.checkOrientation.bind(this)
|
||||
)
|
||||
}
|
||||
if (monkeyPatchMapping) {
|
||||
console.log('Using monkey patched coordinate mapping')
|
||||
@@ -1599,15 +1613,17 @@ export default class PIXIApp extends PIXI.Application {
|
||||
|
||||
// GraphQL
|
||||
if (this.graphql && typeof apollo !== 'undefined') {
|
||||
|
||||
const networkInterface = apollo.createNetworkInterface({
|
||||
uri: '/graphql'
|
||||
})
|
||||
|
||||
const wsClient = new subscriptions.SubscriptionClient(`wss://${location.hostname}/subscriptions`, {
|
||||
reconnect: true,
|
||||
connectionParams: {}
|
||||
})
|
||||
const wsClient = new subscriptions.SubscriptionClient(
|
||||
`wss://${location.hostname}/subscriptions`,
|
||||
{
|
||||
reconnect: true,
|
||||
connectionParams: {}
|
||||
}
|
||||
)
|
||||
|
||||
const networkInterfaceWithSubscriptions = subscriptions.addGraphQLSubscriptions(
|
||||
networkInterface,
|
||||
@@ -1620,7 +1636,11 @@ export default class PIXIApp extends PIXI.Application {
|
||||
}
|
||||
|
||||
// progress
|
||||
this._progress = new Progress(Object.assign({ theme: this.theme }, this.progressOpts, { app: this }))
|
||||
this._progress = new Progress(
|
||||
Object.assign({ theme: this.theme }, this.progressOpts, {
|
||||
app: this
|
||||
})
|
||||
)
|
||||
this._progress.visible = false
|
||||
this.stage.addChild(this._progress)
|
||||
|
||||
@@ -1645,9 +1665,12 @@ export default class PIXIApp extends PIXI.Application {
|
||||
checkOrientation(event) {
|
||||
var value = this.orientation()
|
||||
if (value != this.orient) {
|
||||
setTimeout(100, function () {
|
||||
this.orientationChanged(true)
|
||||
}.bind(this))
|
||||
setTimeout(
|
||||
100,
|
||||
function() {
|
||||
this.orientationChanged(true)
|
||||
}.bind(this)
|
||||
)
|
||||
this.orient = value
|
||||
}
|
||||
}
|
||||
@@ -1670,9 +1693,7 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {number} [width] - The width of the app.
|
||||
* @param {number} [height] - The height of the app.
|
||||
*/
|
||||
layout(width, height) {
|
||||
|
||||
}
|
||||
layout(width, height) {}
|
||||
|
||||
/**
|
||||
* Draws the display tree of the app. Typically this can be delegated
|
||||
@@ -1743,7 +1764,10 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {number} [opts.height=window.innerHeight] - The height of the app to resize to.
|
||||
* @return {PIXIApp} - Returns the PIXIApp for chaining.
|
||||
*/
|
||||
resize(event, { width = window.innerWidth, height = window.innerHeight } = {}) {
|
||||
resize(
|
||||
event,
|
||||
{ width = window.innerWidth, height = window.innerHeight } = {}
|
||||
) {
|
||||
this.width = width
|
||||
this.height = height
|
||||
this.expandRenderer()
|
||||
@@ -1764,7 +1788,8 @@ export default class PIXIApp extends PIXI.Application {
|
||||
monkeyPatchPixiMapping() {
|
||||
if (this.originalMapPositionToPoint === null) {
|
||||
let interactionManager = this.renderer.plugins.interaction
|
||||
this.originalMapPositionToPoint = interactionManager.mapPositionToPoint
|
||||
this.originalMapPositionToPoint =
|
||||
interactionManager.mapPositionToPoint
|
||||
interactionManager.mapPositionToPoint = (point, x, y) => {
|
||||
return this.fixedMapPositionToPoint(point, x, y)
|
||||
}
|
||||
@@ -1772,7 +1797,7 @@ export default class PIXIApp extends PIXI.Application {
|
||||
}
|
||||
|
||||
/**
|
||||
* In some browsers the canvas is distorted if the screen resolution and
|
||||
* In some browsers the canvas is distorted if the screen resolution and
|
||||
* overall size of the canvas exceeds the internal limits (e.g. 4096 x 4096 pixels).
|
||||
* To compensate these distortions we need to fix the mapping to the actual
|
||||
* drawing buffer coordinates.
|
||||
@@ -1791,8 +1816,11 @@ export default class PIXIApp extends PIXI.Application {
|
||||
let canvas = this.renderer.view
|
||||
let context = canvas.getContext('webgl')
|
||||
|
||||
if (context !== null && (context.drawingBufferWidth < canvas.width ||
|
||||
context.drawingBufferHeight < canvas.height)) {
|
||||
if (
|
||||
context !== null &&
|
||||
(context.drawingBufferWidth < canvas.width ||
|
||||
context.drawingBufferHeight < canvas.height)
|
||||
) {
|
||||
extendWidth = context.drawingBufferWidth / canvas.width
|
||||
extendHeight = context.drawingBufferHeight / canvas.height
|
||||
//dx = wantedWidth - context.drawingBufferWidth
|
||||
@@ -1800,7 +1828,12 @@ export default class PIXIApp extends PIXI.Application {
|
||||
}
|
||||
x *= extendWidth
|
||||
y *= extendHeight
|
||||
return this.originalMapPositionToPoint.call(interactionManager, local, x, y + dy)
|
||||
return this.originalMapPositionToPoint.call(
|
||||
interactionManager,
|
||||
local,
|
||||
x,
|
||||
y + dy
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1834,7 +1867,6 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* called without a parameter.
|
||||
*/
|
||||
progress(value) {
|
||||
|
||||
if (typeof value === 'undefined') {
|
||||
return this._progress
|
||||
}
|
||||
@@ -1852,8 +1884,9 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @return {Modal} Returns the Modal object.
|
||||
*/
|
||||
modal(opts = {}) {
|
||||
|
||||
let modal = new Modal(Object.assign({ theme: this.theme }, opts, { app: this }))
|
||||
let modal = new Modal(
|
||||
Object.assign({ theme: this.theme }, opts, { app: this })
|
||||
)
|
||||
this.scene.addChild(modal)
|
||||
|
||||
return modal
|
||||
@@ -1866,8 +1899,9 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @return {Message} Returns the Message object.
|
||||
*/
|
||||
message(opts = {}) {
|
||||
|
||||
let message = new Message(Object.assign({ theme: this.theme }, opts, { app: this }))
|
||||
let message = new Message(
|
||||
Object.assign({ theme: this.theme }, opts, { app: this })
|
||||
)
|
||||
this.scene.addChild(message)
|
||||
|
||||
return message
|
||||
@@ -1886,21 +1920,26 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {boolean} [opts.progress=false] - Should a progress bar display the loading status?
|
||||
* @return {PIXIApp} The PIXIApp object for chaining.
|
||||
*/
|
||||
loadSprites(resources, loaded = null, { resolutionDependent = true, progress = false } = {}) {
|
||||
loadSprites(
|
||||
resources,
|
||||
loaded = null,
|
||||
{ resolutionDependent = true, progress = false } = {}
|
||||
) {
|
||||
this.loadTextures(
|
||||
resources,
|
||||
textures => {
|
||||
let sprites = new Map()
|
||||
|
||||
this.loadTextures(resources, textures => {
|
||||
for (let [key, texture] of textures) {
|
||||
sprites.set(key, new PIXI.Sprite(texture))
|
||||
}
|
||||
|
||||
let sprites = new Map()
|
||||
|
||||
for (let [key, texture] of textures) {
|
||||
sprites.set(key, new PIXI.Sprite(texture))
|
||||
}
|
||||
|
||||
if (loaded) {
|
||||
loaded.call(this, sprites)
|
||||
}
|
||||
|
||||
}, { resolutionDependent, progress })
|
||||
if (loaded) {
|
||||
loaded.call(this, sprites)
|
||||
}
|
||||
},
|
||||
{ resolutionDependent, progress }
|
||||
)
|
||||
|
||||
return this
|
||||
}
|
||||
@@ -1918,8 +1957,11 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {boolean} [opts.progress=false] - Should a progress bar display the loading status?
|
||||
* @return {PIXIApp} The PIXIApp object for chaining.
|
||||
*/
|
||||
loadTextures(resources, loaded = null, { resolutionDependent = true, progress = false } = {}) {
|
||||
|
||||
loadTextures(
|
||||
resources,
|
||||
loaded = null,
|
||||
{ resolutionDependent = true, progress = false } = {}
|
||||
) {
|
||||
if (!Array.isArray(resources)) {
|
||||
resources = [resources]
|
||||
}
|
||||
@@ -1927,17 +1969,21 @@ export default class PIXIApp extends PIXI.Application {
|
||||
const loader = this.loader
|
||||
|
||||
for (let resource of resources) {
|
||||
|
||||
if (!loader.resources[resource]) {
|
||||
|
||||
if (resolutionDependent) {
|
||||
let resolution = Math.round(this.renderer.resolution)
|
||||
switch (resolution) {
|
||||
case 2:
|
||||
loader.add(resource, resource.replace(/\.([^.]*)$/, '@2x.$1'))
|
||||
loader.add(
|
||||
resource,
|
||||
resource.replace(/\.([^.]*)$/, '@2x.$1')
|
||||
)
|
||||
break
|
||||
case 3:
|
||||
loader.add(resource, resource.replace(/\.([^.]*)$/, '@3x.$1'))
|
||||
loader.add(
|
||||
resource,
|
||||
resource.replace(/\.([^.]*)$/, '@3x.$1')
|
||||
)
|
||||
break
|
||||
default:
|
||||
loader.add(resource)
|
||||
@@ -1980,7 +2026,6 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* rejected with an error.
|
||||
*/
|
||||
query(query, opts = {}) {
|
||||
|
||||
if (typeof query === 'string') {
|
||||
opts = Object.assign({}, opts, { query })
|
||||
} else {
|
||||
@@ -2012,7 +2057,6 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* rejected with an error.
|
||||
*/
|
||||
mutate(mutation, opts = {}) {
|
||||
|
||||
if (typeof mutation === 'string') {
|
||||
opts = Object.assign({}, opts, { mutation })
|
||||
} else {
|
||||
@@ -2044,7 +2088,6 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* rejected with an error.
|
||||
*/
|
||||
subscribe(subscription, opts = {}) {
|
||||
|
||||
if (typeof subscription === 'string') {
|
||||
opts = Object.assign({}, opts, { subscription })
|
||||
} else {
|
||||
@@ -2075,13 +2118,13 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {DisplayObject} displayObject - The PIXI displayObject.
|
||||
* @param {number} x - The x coordinate.
|
||||
* @param {number} y - The y coordinate.
|
||||
*
|
||||
*
|
||||
* @return {PIXI.Point} Returns a PIXI.Point.
|
||||
*/
|
||||
|
||||
convertPointFromPageToNode(displayObject, x, y) {
|
||||
let resolution = this.renderer.resolution
|
||||
console.log("resolution", resolution)
|
||||
console.log('resolution', resolution)
|
||||
let pixiGlobal = window.convertPointFromPageToNode(app.view, x, y)
|
||||
pixiGlobal.x /= resolution
|
||||
pixiGlobal.y /= resolution
|
||||
@@ -2095,7 +2138,7 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @param {DisplayObject} displayObject - The PIXI displayObject.
|
||||
* @param {number} x - The x coordinate.
|
||||
* @param {number} y - The y coordinate.
|
||||
*
|
||||
*
|
||||
* @return {Point} Returns a DOM Point.
|
||||
*/
|
||||
|
||||
@@ -2105,7 +2148,11 @@ export default class PIXIApp extends PIXI.Application {
|
||||
pixiGlobal.x *= resolution
|
||||
pixiGlobal.y *= resolution
|
||||
// console.log("app.convertPointFromNodeToPage", pixiGlobal)
|
||||
return window.convertPointFromNodeToPage(app.view, pixiGlobal.x, pixiGlobal.y)
|
||||
return window.convertPointFromNodeToPage(
|
||||
app.view,
|
||||
pixiGlobal.x,
|
||||
pixiGlobal.y
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2119,7 +2166,6 @@ export default class PIXIApp extends PIXI.Application {
|
||||
* @see {@link http://pixijs.download/dev/docs/PIXI.Graphics.html|PIXI.Graphics}
|
||||
*/
|
||||
class FpsDisplay extends PIXI.Graphics {
|
||||
|
||||
/**
|
||||
* Creates an instance of a FpsDisplay.
|
||||
*
|
||||
@@ -2127,25 +2173,27 @@ class FpsDisplay extends PIXI.Graphics {
|
||||
* @param {PIXIApp} app - The PIXIApp where the frames per second should be displayed.
|
||||
*/
|
||||
constructor(app) {
|
||||
|
||||
super()
|
||||
|
||||
this.app = app
|
||||
|
||||
this.lineStyle(3, 0x434f4f, 1)
|
||||
.beginFill(0x434f4f, .6)
|
||||
.beginFill(0x434f4f, 0.6)
|
||||
.drawRoundedRect(0, 0, 68, 32, 5)
|
||||
.endFill()
|
||||
.position.set(20, 20)
|
||||
|
||||
this.text = new PIXI.Text(this.fps, new PIXI.TextStyle({
|
||||
fontFamily: 'Arial',
|
||||
fontSize: 14,
|
||||
fontWeight: 'bold',
|
||||
fill: '#f6f6f6',
|
||||
stroke: '#434f4f',
|
||||
strokeThickness: 3
|
||||
}))
|
||||
this.text = new PIXI.Text(
|
||||
this.fps,
|
||||
new PIXI.TextStyle({
|
||||
fontFamily: 'Arial',
|
||||
fontSize: 14,
|
||||
fontWeight: 'bold',
|
||||
fill: '#f6f6f6',
|
||||
stroke: '#434f4f',
|
||||
strokeThickness: 3
|
||||
})
|
||||
)
|
||||
this.text.position.set(6, 6)
|
||||
|
||||
this.addChild(this.text)
|
||||
@@ -2161,7 +2209,7 @@ class FpsDisplay extends PIXI.Graphics {
|
||||
* @return {PIXIApp} Returns the PIXIApp object for chaining.
|
||||
*/
|
||||
refreshFps() {
|
||||
this.text.text = `${(this.app.ticker.FPS).toFixed(1)} fps`
|
||||
this.text.text = `${this.app.ticker.FPS.toFixed(1)} fps`
|
||||
|
||||
return this
|
||||
}
|
||||
@@ -2179,7 +2227,7 @@ class FpsDisplay extends PIXI.Graphics {
|
||||
|
||||
<footer class="content-size">
|
||||
<div class="footer">
|
||||
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.2</a> on Wed Jul 10 2019 11:54:25 GMT+0200 (Mitteleuropäische Sommerzeit)
|
||||
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.3</a> on Thu Jul 18 2019 12:16:18 GMT+0200 (Mitteleuropäische Sommerzeit)
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user