minerender 1.4.11 → 2.0.0-alpha.1

package/src/entity/scene/EntityObject.d.ts

@@ -0,0 +1,20 @@
+import { SceneObject } from "../../renderer/SceneObject";
+import { SceneObjectOptions } from "../../renderer/SceneObjectOptions";
+import { EntityModel } from "../EntityModel";
+export declare class EntityObject extends SceneObject {
+    readonly entity: EntityModel;
+    readonly isEntityObject: true;
+    static readonly DEFAULT_OPTIONS: EntityObjectOptions;
+    readonly options: EntityObjectOptions;
+    private imageData?;
+    private meshesCreated;
+    constructor(entity: EntityModel, options?: Partial<EntityObjectOptions>);
+    init(): Promise<void>;
+    dispose(): void;
+    protected loadTextures(): Promise<void>;
+    protected createMeshes(force?: boolean): void;
+    protected applyTextures(): Promise<void>;
+}
+export interface EntityObjectOptions extends SceneObjectOptions {
+}
+export declare function isEntityObject(obj: any): obj is EntityObject;

package/src/entity/scene/EntityObject.js

@@ -0,0 +1,116 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEntityObject = exports.EntityObject = void 0;
+const SceneObject_1 = require("../../renderer/SceneObject");
+const Assets_1 = require("../../assets/Assets");
+const ts_deepmerge_1 = __importDefault(require("ts-deepmerge"));
+const three_1 = require("three");
+const model_1 = require("../../util/model");
+const ModelTextures_1 = require("../../assets/ModelTextures");
+const AssetKey_1 = require("../../assets/AssetKey");
+const Materials_1 = require("../../Materials");
+const MinecraftCubeTexture_1 = require("../../MinecraftCubeTexture");
+const THREE = __importStar(require("three"));
+class EntityObject extends SceneObject_1.SceneObject {
+    constructor(entity, options) {
+        super();
+        this.entity = entity;
+        this.isEntityObject = true;
+        this.meshesCreated = false;
+        this.options = ts_deepmerge_1.default({}, SceneObject_1.SceneObject.DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
+        //TODO
+    }
+    async init() {
+        this.createMeshes();
+        await this.applyTextures();
+    }
+    dispose() {
+        super.dispose();
+    }
+    async loadTextures() {
+        var _a, _b;
+        this.imageData = await ModelTextures_1.ModelTextures.get(new AssetKey_1.AssetKey((_b = (_a = this.entity.key) === null || _a === void 0 ? void 0 : _a.namespace) !== null && _b !== void 0 ? _b : Assets_1.DEFAULT_NAMESPACE, this.entity.key.path, "textures", "entity", ".png"));
+    }
+    createMeshes(force = false) {
+        console.log("createMeshes");
+        if (this.meshesCreated && !force)
+            return;
+        const mat = Materials_1.Materials.MISSING_TEXTURE;
+        //TODO: don't know which parts are actually meant to be rendered atm
+        for (let partName in this.entity.parts) {
+            const part = this.entity.parts[partName];
+            const texture = new MinecraftCubeTexture_1.MinecraftCubeTexture(part.textureOffsetU, part.textureOffsetV, part.textureWidth, part.textureHeight);
+            const partAnchor = new three_1.Object3D();
+            partAnchor.position.x = part.pivotX;
+            partAnchor.position.y = part.pivotY;
+            partAnchor.position.z = part.pivotZ;
+            for (let cube of part.cubes) {
+                const w = cube.maxX - cube.minX;
+                const h = cube.maxY - cube.minY;
+                const l = cube.maxZ - cube.minZ;
+                const uv = texture.toUvArray(w, h, l);
+                const cubeGeo = this._getBoxGeometryForDimensionsAndUv(w, h, l, uv).clone();
+                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(w / 2, h / 2, l / 2));
+                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(cube.minX, cube.minY, cube.minZ));
+                model_1.applyModelPartRotation(part, cubeGeo);
+                // TODO: merge parts
+                // const mesh = this.createAndAddMesh(partName, undefined, cubeGeo, mat);
+                const mesh = this.createMesh(partName, cubeGeo, mat);
+                partAnchor.add(mesh);
+                if (this.options.wireframe) {
+                    model_1.addWireframeToMesh(cubeGeo, mesh);
+                }
+            }
+            this.add(partAnchor);
+        }
+        //TODO
+        this.meshesCreated = true;
+    }
+    async applyTextures() {
+        var _a, _b;
+        const textureAsset = await ModelTextures_1.ModelTextures.preload(new AssetKey_1.AssetKey((_b = (_a = this.entity.key) === null || _a === void 0 ? void 0 : _a.namespace) !== null && _b !== void 0 ? _b : Assets_1.DEFAULT_NAMESPACE, this.entity.key.path, "textures", "entity", ".png"));
+        // if (this.atlas!.model.textures) {
+        //     for (let textureKey in this.atlas!.model.textures) {
+        //         let asset = this.textureMap[textureKey];
+        //         if (asset) {
+        //TODO: transparency
+        if (textureAsset) {
+            let mat = Materials_1.Materials.getImage({ texture: { src: textureAsset.src } });
+            this.iterateAllMeshes(mesh => {
+                mesh.material = mat;
+            });
+        }
+        //         }
+        //     }
+        // }
+    }
+}
+exports.EntityObject = EntityObject;
+EntityObject.DEFAULT_OPTIONS = ts_deepmerge_1.default({}, SceneObject_1.SceneObject.DEFAULT_OPTIONS, {});
+function isEntityObject(obj) {
+    return obj.isEntityObject;
+}
+exports.isEntityObject = isEntityObject;
+//# sourceMappingURL=EntityObject.js.map

package/src/entity/scene/EntityObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityObject.js","sourceRoot":"./","sources":["src/entity/scene/EntityObject.ts"],"names":[],"mappings":"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"}

package/src/entity/scene/EntityObject.ts

@@ -0,0 +1,138 @@
+import { SceneObject } from "../../renderer/SceneObject";
+import { BlockState, BlockStateVariant, BlockStateVariants, MultipartCondition } from "../../model/block/BlockState";
+import { SceneObjectOptions } from "../../renderer/SceneObjectOptions";
+import { Caching } from "../../cache/Caching";
+import { Models } from "../../assets/Models";
+import { Assets, DEFAULT_NAMESPACE } from "../../assets/Assets";
+import merge from "ts-deepmerge";
+import { AxesHelper, Euler, Matrix4, Object3D, Vector3 } from "three";
+import { Maybe, toRadians } from "../../util/util";
+import { addWireframeToMesh, addWireframeToObject, applyElementRotation, applyGenericRotation, applyModelPartRotation } from "../../util/model";
+import { ModelTextures } from "../../assets/ModelTextures";
+import { AssetKey } from "../../assets/AssetKey";
+import { ExtractableImageData } from "../../ExtractableImageData";
+import { Materials } from "../../Materials";
+import { MinecraftCubeTexture } from "../../MinecraftCubeTexture";
+import * as THREE from "three";
+import { Ticker } from "../../Ticker";
+import { EntityModel } from "../EntityModel";
+
+export class EntityObject extends SceneObject {
+
+    public readonly isEntityObject: true = true;
+
+    public static readonly DEFAULT_OPTIONS: EntityObjectOptions = merge({}, SceneObject.DEFAULT_OPTIONS, <EntityObjectOptions>{});
+    public readonly options: EntityObjectOptions;
+
+    private imageData?: ExtractableImageData;
+
+    private meshesCreated: boolean = false;
+
+    constructor(readonly entity: EntityModel, options?: Partial<EntityObjectOptions>) {
+        super();
+        this.options = merge({}, SceneObject.DEFAULT_OPTIONS, options ?? {});
+        //TODO
+    }
+
+    async init(): Promise<void> {
+        this.createMeshes();
+        await this.applyTextures();
+    }
+
+    dispose() {
+        super.dispose();
+    }
+
+    protected async loadTextures(): Promise<void> {
+        this.imageData = await ModelTextures.get(new AssetKey(
+            this.entity.key?.namespace ?? DEFAULT_NAMESPACE,
+            this.entity.key!.path, //TODO: texture may differ from entity name; most of them are in subdirectories for multiple variants etc.
+            "textures",
+            "entity",
+            "assets",
+            ".png"
+        ))
+    }
+
+    //TODO: abstract this, since extracted model data can be used for entities, blocks, players
+    protected createMeshes(force: boolean = false) {
+        if (this.meshesCreated && !force) return;
+
+        const mat = Materials.MISSING_TEXTURE;
+
+        //TODO: don't know which parts are actually meant to be rendered atm
+        for (let partName in this.entity.parts) {
+            const part = this.entity.parts[partName];
+            const texture = new MinecraftCubeTexture(part.textureOffsetU, part.textureOffsetV, part.textureWidth, part.textureHeight);
+            const partAnchor = new Object3D();
+            partAnchor.position.x = part.pivotX;
+            partAnchor.position.y = part.pivotY;
+            partAnchor.position.z = part.pivotZ;
+            for (let cube of part.cubes) {
+                const w = cube.maxX - cube.minX;
+                const h = cube.maxY - cube.minY;
+                const l = cube.maxZ - cube.minZ;
+                const uv = texture.toUvArray(w, h, l);
+
+                //TODO: mirror
+                // MC does it by flipping min and max X; might be easier than moving around all face UVs
+
+                const cubeGeo = this._getBoxGeometryForDimensionsAndUv(w, h, l, uv).clone();
+
+                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(w / 2, h / 2, l / 2));
+                cubeGeo.applyMatrix4(new THREE.Matrix4().makeTranslation(cube.minX, cube.minY, cube.minZ));
+
+                applyModelPartRotation(part, cubeGeo);
+
+
+                // TODO: merge parts
+                // const mesh = this.createAndAddMesh(partName, undefined, cubeGeo, mat);
+                const mesh = this.createMesh(partName, cubeGeo, mat);
+                partAnchor.add(mesh);
+                if (this.options.wireframe) {
+                    addWireframeToMesh(cubeGeo, mesh);
+                }
+            }
+            this.add(partAnchor);
+        }
+
+        //TODO
+
+        this.meshesCreated = true;
+    }
+
+    protected async applyTextures() {
+
+        const textureAsset = await ModelTextures.preload(new AssetKey(
+            this.entity.key?.namespace ?? DEFAULT_NAMESPACE,
+            this.entity.key!.path,
+            "textures",
+            "entity",
+            "assets",
+            ".png"
+        ));
+        // if (this.atlas!.model.textures) {
+        //     for (let textureKey in this.atlas!.model.textures) {
+        //         let asset = this.textureMap[textureKey];
+        //         if (asset) {
+        //TODO: transparency
+        if (textureAsset) {
+            let mat = Materials.getImage({ texture: { src: textureAsset.src! } })
+            this.iterateAllMeshes(mesh => {
+                mesh.material = mat;
+            });
+        }
+        //         }
+        //     }
+        // }
+    }
+
+
+}
+
+export interface EntityObjectOptions extends SceneObjectOptions {
+}
+
+export function isEntityObject(obj: any): obj is EntityObject {
+    return (<EntityObject>obj).isEntityObject;
+}

package/src/error/MineRenderError.d.ts

@@ -0,0 +1,4 @@
+export declare class MineRenderError extends Error {
+    constructor(msg: any);
+    get name(): string;
+}

package/src/error/MineRenderError.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MineRenderError = void 0;
+// https://stackoverflow.com/a/60323233/6257838
+class MineRenderError extends Error {
+    constructor(msg) {
+        super(msg);
+        Object.setPrototypeOf(this, MineRenderError.prototype);
+    }
+    get name() {
+        return 'MineRenderError';
+    }
+}
+exports.MineRenderError = MineRenderError;
+//# sourceMappingURL=MineRenderError.js.map

package/src/error/MineRenderError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MineRenderError.js","sourceRoot":"./","sources":["src/error/MineRenderError.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,MAAa,eAAgB,SAAQ,KAAK;IACtC,YAAY,GAAG;QACX,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ;AATD,0CASC"}

package/src/error/MineRenderError.ts

@@ -0,0 +1,11 @@
+// https://stackoverflow.com/a/60323233/6257838
+export class MineRenderError extends Error {
+    constructor(msg) {
+        super(msg);
+        Object.setPrototypeOf(this, MineRenderError.prototype);
+    }
+
+    get name(): string {
+        return 'MineRenderError';
+    }
+}

package/src/gui/scene/GuiObject.ts

@@ -0,0 +1,13 @@
+import { Renderer, RendererOptions } from "../../renderer/Renderer";
+import { SceneObject } from "../../renderer/SceneObject";
+import { SceneObjectOptions } from "../../renderer/SceneObjectOptions";
+
+export class GuiObject extends SceneObject {
+
+    //TODO
+
+}
+
+export interface GuiObjectOptions extends SceneObjectOptions {
+
+}

package/src/image/ImageLoader.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import { CompatImage } from "../canvas/CanvasCompat";
+import { AxiosResponse } from "axios";
+import { WrappedImage } from "../WrappedImage";
+import { ExtractableImageData } from "../ExtractableImageData";
+export interface ImageInfo {
+    src?: string;
+    width: number;
+    height: number;
+    type?: string;
+    data: Buffer;
+}
+export declare class ImageLoader {
+    protected static _createImage(): CompatImage;
+    static loadAsync(src: string): Promise<CompatImage>;
+    static loadElement(src: string, onload?: () => void, onerr?: (err: Error) => void): CompatImage;
+    static loadData(src: string): Promise<ImageData>;
+    static loadCanvasData(src: string): Promise<ExtractableImageData>;
+    static infoToCanvasData(info: ImageInfo): Promise<ExtractableImageData>;
+    static infoToData(info: ImageInfo): Promise<ImageData>;
+    static getData(src: string): Promise<ImageData>;
+    static getCanvasData(src: string): Promise<ExtractableImageData>;
+    static processResponse(response: Partial<AxiosResponse>): Promise<ImageInfo>;
+    static loadInfo(src: string): Promise<ImageInfo>;
+    static getInfo(src: string): Promise<ImageInfo>;
+    static loadWrapped(src: string): Promise<WrappedImage>;
+    static getWrapped(src: string): Promise<WrappedImage>;
+}

package/src/image/ImageLoader.js

@@ -0,0 +1,134 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImageLoader = void 0;
+const CanvasCompat_1 = require("../canvas/CanvasCompat");
+const CacheKey_1 = require("../cache/CacheKey");
+const Caching_1 = require("../cache/Caching");
+const image_size_1 = __importDefault(require("image-size"));
+const Requests_1 = require("../request/Requests");
+const WrappedImage_1 = require("../WrappedImage");
+const buffer_1 = require("buffer");
+class ImageLoader {
+    static _createImage() {
+        //TODO: probably needs cross-origin stuff set for browser
+        return CanvasCompat_1.createImage();
+    }
+    static async loadAsync(src) {
+        return new Promise((resolve, reject) => {
+            const image = this._createImage();
+            image.src = src;
+            image.onload = () => resolve(image);
+            image.onerror = (err) => reject(err);
+        });
+    }
+    static loadElement(src, onload, onerr) {
+        const image = this._createImage();
+        image.src = src;
+        if (onload)
+            image.onload = onload;
+        if (onerr)
+            image.onerror = onerr;
+        return image;
+    }
+    static async loadData(src) {
+        console.log("loadData");
+        return await this.infoToData(await this.getInfo(src));
+    }
+    static async loadCanvasData(src) {
+        return await this.infoToCanvasData(await this.getInfo(src));
+    }
+    static async infoToCanvasData(info) {
+        const image = await ImageLoader.loadAsync(info.src);
+        const canvas = CanvasCompat_1.createCanvas(info.width, info.height);
+        const context = canvas.getContext("2d");
+        context.drawImage(image, 0, 0);
+        return {
+            data: context,
+            width: info.width,
+            height: info.height
+        };
+        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
+    }
+    static async infoToData(info) {
+        const image = await ImageLoader.loadAsync(info.src);
+        const canvas = CanvasCompat_1.createCanvas(info.width, info.height);
+        const context = canvas.getContext("2d");
+        context.drawImage(image, 0, 0);
+        return context.getImageData(0, 0, canvas.width, canvas.height);
+        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
+    }
+    static async getData(src) {
+        const keyStr = CacheKey_1.serializeImageKey({ src });
+        return (await Caching_1.Caching.imageDataCache.get(keyStr, k => {
+            return ImageLoader.loadData(src);
+        }));
+    }
+    static async getCanvasData(src) {
+        const keyStr = CacheKey_1.serializeImageKey({ src });
+        return (await Caching_1.Caching.canvasImageDataCache.get(keyStr, k => {
+            return ImageLoader.loadCanvasData(src);
+        }));
+    }
+    static async processResponse(response) {
+        const src = response.config.url;
+        const data = buffer_1.Buffer.from(response.data);
+        const { width, height, type } = image_size_1.default(data);
+        return {
+            src,
+            width: width || 0,
+            height: height || 0,
+            type,
+            data: data
+        };
+    }
+    static async loadInfo(src) {
+        console.log("loadInfo");
+        // axios doesn't like data urls
+        if (src.startsWith("data:image/png;base64")) {
+            return this.processResponse({
+                config: {
+                    url: src
+                },
+                data: buffer_1.Buffer.from(src.substr("data:image/png;base64,".length), "base64")
+            });
+        }
+        //TODO: figure out a way to allow data/base64 requests
+        return Requests_1.Requests.genericRequest({
+            url: src,
+            responseType: "arraybuffer"
+        })
+            .then(this.processResponse)
+            .catch(err => {
+            console.log(src);
+            console.log(err);
+            return {
+                src,
+                width: 0,
+                height: 0,
+                type: undefined,
+                data: buffer_1.Buffer.from([0])
+            };
+        });
+    }
+    static async getInfo(src) {
+        const keyStr = CacheKey_1.serializeImageKey({ src });
+        return (await Caching_1.Caching.rawImageCache.get(keyStr, k => {
+            return ImageLoader.loadInfo(src);
+        }));
+    }
+    static async loadWrapped(src) {
+        const data = await this.getCanvasData(src);
+        return new WrappedImage_1.WrappedImage(data);
+    }
+    static async getWrapped(src) {
+        const keyStr = CacheKey_1.serializeImageKey({ src });
+        return (await Caching_1.Caching.wrappedImageCache.get(keyStr, k => {
+            return ImageLoader.loadWrapped(src);
+        }));
+    }
+}
+exports.ImageLoader = ImageLoader;
+//# sourceMappingURL=ImageLoader.js.map

package/src/image/ImageLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageLoader.js","sourceRoot":"./","sources":["src/image/ImageLoader.ts"],"names":[],"mappings":"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"}

package/src/image/ImageLoader.ts

@@ -0,0 +1,161 @@
+import { CompatImage, createCanvas, createImage } from "../canvas/CanvasCompat";
+import { serializeImageKey } from "../cache/CacheKey";
+import { Caching } from "../cache/Caching";
+import { AxiosResponse } from "axios";
+import imageSize from "image-size";
+import { Requests } from "../request/Requests";
+import { SSAOPassOUTPUT } from "three/examples/jsm/postprocessing/SSAOPass";
+import { WrappedImage } from "../WrappedImage";
+import { ExtractableImageData } from "../ExtractableImageData";
+import { Buffer } from "buffer";
+import { prefix } from "../util/log";
+
+const p = prefix("ImageLoader");
+
+export interface ImageInfo {
+    src?: string;
+    width: number;
+    height: number;
+    type?: string;
+    data: Buffer;
+}
+
+export class ImageLoader {
+
+    protected static _createImage(): CompatImage {
+        //TODO: probably needs cross-origin stuff set for browser
+        return createImage();
+    }
+
+    public static async loadAsync(src: string): Promise<CompatImage> {
+        return new Promise<CompatImage>((resolve, reject) => {
+            const image = this._createImage();
+            image.src = src;
+            image.onload = () => resolve(image);
+            image.onerror = (err: Error) => reject(err);
+        });
+    }
+
+    public static loadElement(src: string, onload?: () => void, onerr?: (err: Error) => void): CompatImage {
+        const image = this._createImage();
+        image.src = src;
+        if (onload)
+            image.onload = onload;
+        if (onerr)
+            image.onerror = onerr;
+        return image;
+    }
+
+    public static async loadData(src: string): Promise<ImageData> {
+        console.debug(p, "loadData", src);
+        return await this.infoToData(await this.getInfo(src));
+    }
+
+    public static async loadCanvasData(src: string): Promise<ExtractableImageData> {
+        return await this.infoToCanvasData(await this.getInfo(src));
+    }
+
+    public static async infoToCanvasData(info: ImageInfo): Promise<ExtractableImageData> {
+        const image = await ImageLoader.loadAsync(info.src!);
+        const canvas = createCanvas(info.width, info.height);
+        const context = canvas.getContext("2d") as CanvasRenderingContext2D;
+        context.drawImage(image as CanvasImageSource, 0, 0);
+        return {
+            data: context,
+            width: info.width,
+            height: info.height
+        }
+
+        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
+    }
+
+
+    public static async infoToData(info: ImageInfo): Promise<ImageData> {
+        const image = await ImageLoader.loadAsync(info.src!);
+        const canvas = createCanvas(info.width, info.height);
+        const context = canvas.getContext("2d") as CanvasRenderingContext2D;
+        context.drawImage(image as CanvasImageSource, 0, 0);
+        return context.getImageData(0, 0, canvas.width, canvas.height);
+
+
+        // return new ImageData(new Uint8ClampedArray(info.data), info.width, info.height)
+    }
+
+    public static async getData(src: string): Promise<ImageData> {
+        const keyStr = serializeImageKey({ src });
+        return (await Caching.imageDataCache.get(keyStr, k => {
+            return ImageLoader.loadData(src);
+        }))!;
+    }
+
+    public static async getCanvasData(src: string): Promise<ExtractableImageData> {
+        const keyStr = serializeImageKey({ src });
+        return (await Caching.canvasImageDataCache.get(keyStr, k => {
+            return ImageLoader.loadCanvasData(src);
+        }))!;
+    }
+
+    public static async processResponse(response: Partial<AxiosResponse>): Promise<ImageInfo> {
+        const src = response.config!.url;
+        const data = Buffer.from(response.data!);
+        const { width, height, type } = imageSize(data);
+        return {
+            src,
+            width: width || 0,
+            height: height || 0,
+            type,
+            data: data
+        }
+    }
+
+
+    public static async loadInfo(src: string): Promise<ImageInfo> {
+
+        // axios doesn't like data urls
+        if (src.startsWith("data:image/png;base64")) {
+            return this.processResponse({
+                config: {
+                    url: src
+                },
+                data: Buffer.from(src.substr("data:image/png;base64,".length), "base64")
+            })
+        }
+
+        //TODO: figure out a way to allow data/base64 requests
+        return Requests.genericRequest({
+            url: src,
+            responseType: "arraybuffer"
+        })
+            .then(this.processResponse)
+            .catch(err => {
+                return {
+                    src,
+                    width: 0,
+                    height: 0,
+                    type: undefined,
+                    data: Buffer.from([0])
+                };
+            });
+    }
+
+    public static async getInfo(src: string): Promise<ImageInfo> {
+        const keyStr = serializeImageKey({ src });
+        return (await Caching.rawImageCache.get(keyStr, k => {
+            return ImageLoader.loadInfo(src);
+        }))!;
+    }
+
+    public static async loadWrapped(src: string): Promise<WrappedImage> {
+        const data = await this.getCanvasData(src);
+        return new WrappedImage(data);
+    }
+
+    public static async getWrapped(src: string): Promise<WrappedImage> {
+        const keyStr = serializeImageKey({ src });
+        return (await Caching.wrappedImageCache.get(keyStr, k => {
+            return ImageLoader.loadWrapped(src);
+        }))!;
+    }
+
+
+}