mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-11-26 12:35:11 +01:00
Move BlueMapWeb code into BlueMapVue
This commit is contained in:
Lukas Rieger (Blue)
parent
bd52fb6eb7
commit
8fad71ac74
@ -1,25 +0,0 @@
|
||||
name: Node.js CI
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [14.x]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
- run: npm ci
|
||||
- run: npm run build
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: artifacts
|
||||
path: build/*
|
||||
@ -1,9 +0,0 @@
|
||||
.classpath
|
||||
.project
|
||||
.idea
|
||||
|
||||
build
|
||||
doc
|
||||
node_modules
|
||||
|
||||
public/js
|
||||
@ -1,13 +0,0 @@
|
||||
.classpath
|
||||
.project
|
||||
.idea
|
||||
|
||||
build
|
||||
doc
|
||||
node_modules
|
||||
|
||||
public/js
|
||||
|
||||
###### Below is additionally to .gitignore
|
||||
.github
|
||||
public
|
||||
@ -1,22 +0,0 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) Blue <https://www.bluecolored.de>
|
||||
Copyright (c) contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
5777
BlueMapCommon/BlueMapVue/BlueMapWeb/package-lock.json
generated
5777
BlueMapCommon/BlueMapVue/BlueMapWeb/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,43 +0,0 @@
|
||||
{
|
||||
"name": "bluemap",
|
||||
"version": "1.1.0",
|
||||
"description": "A library to load and display Minecraft maps generated by BlueMap.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/BlueMap-Minecraft/BlueMapWeb.git"
|
||||
},
|
||||
"keywords": [
|
||||
"minecraft",
|
||||
"minecraft-mod",
|
||||
"minecraft-plugin",
|
||||
"threejs",
|
||||
"webgl",
|
||||
"bluemap"
|
||||
],
|
||||
"author": "Lukas Rieger <contact@bluecolored.de> (https://bluecolored.de/)",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/BlueMap-Minecraft/BlueMap/issues"
|
||||
},
|
||||
"homepage": "https://bluecolo.red/bluemap",
|
||||
"dependencies": {
|
||||
"hammerjs": "~2.0.8",
|
||||
"three": "~0.123.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "~7.11.6",
|
||||
"@babel/plugin-proposal-class-properties": "~7.10.4",
|
||||
"@babel/polyfill": "~7.11.5",
|
||||
"@babel/preset-env": "~7.11.5",
|
||||
"@rollup/plugin-babel": "~5.2.1",
|
||||
"@types/babel__core": "~7.1.9",
|
||||
"concurrently": "~5.3.0",
|
||||
"copyfiles": "~2.3.0",
|
||||
"http-server": "~0.12.3",
|
||||
"rollup": "~2.28.2",
|
||||
"rollup-plugin-terser": "~7.0.2"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "rollup -c"
|
||||
}
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
import babel from "@rollup/plugin-babel";
|
||||
import { terser } from "rollup-plugin-terser";
|
||||
|
||||
const babelrc = {
|
||||
babelHelpers: 'bundled',
|
||||
presets: [
|
||||
['@babel/preset-env', {
|
||||
targets: "> 0.25%, not dead",
|
||||
bugfixes: true,
|
||||
loose: true
|
||||
}]
|
||||
],
|
||||
plugins: [
|
||||
['@babel/plugin-proposal-class-properties', {
|
||||
loose: true
|
||||
}]
|
||||
]
|
||||
};
|
||||
|
||||
export default [
|
||||
{
|
||||
input: 'src/BlueMap.js',
|
||||
external: [ 'three', 'hammerjs' ],
|
||||
plugins: [
|
||||
babel( {
|
||||
compact: false,
|
||||
babelrc: false,
|
||||
...babelrc
|
||||
} )
|
||||
],
|
||||
output: [
|
||||
{
|
||||
format: 'umd',
|
||||
name: 'BlueMap',
|
||||
file: 'build/bluemap.js',
|
||||
indent: '\t',
|
||||
globals: {
|
||||
three: 'THREE',
|
||||
hammerjs: 'Hammer',
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
];
|
||||
@ -1,77 +0,0 @@
|
||||
import babel from "@rollup/plugin-babel";
|
||||
import { terser } from "rollup-plugin-terser";
|
||||
|
||||
const babelrc = {
|
||||
babelHelpers: 'bundled',
|
||||
presets: [
|
||||
['@babel/preset-env', {
|
||||
targets: "> 0.25%, not dead",
|
||||
bugfixes: true,
|
||||
loose: true
|
||||
}]
|
||||
],
|
||||
plugins: [
|
||||
['@babel/plugin-proposal-class-properties', {
|
||||
loose: true
|
||||
}]
|
||||
]
|
||||
};
|
||||
|
||||
export default [
|
||||
{
|
||||
input: 'src/BlueMap.js',
|
||||
external: [ 'three', 'hammerjs' ],
|
||||
plugins: [
|
||||
babel( {
|
||||
compact: false,
|
||||
babelrc: false,
|
||||
...babelrc
|
||||
} )
|
||||
],
|
||||
output: [
|
||||
{
|
||||
format: 'umd',
|
||||
name: 'BlueMap',
|
||||
file: 'build/bluemap.js',
|
||||
indent: '\t',
|
||||
globals: {
|
||||
three: 'THREE',
|
||||
hammerjs: 'Hammer',
|
||||
}
|
||||
}
|
||||
],
|
||||
},
|
||||
{
|
||||
input: 'src/BlueMap.js',
|
||||
external: [ 'three', 'hammerjs' ],
|
||||
plugins: [
|
||||
babel( {
|
||||
babelrc: false,
|
||||
...babelrc
|
||||
} ),
|
||||
terser(),
|
||||
],
|
||||
output: [
|
||||
{
|
||||
format: 'umd',
|
||||
name: 'BlueMap',
|
||||
file: 'build/bluemap.min.js',
|
||||
globals: {
|
||||
three: 'THREE',
|
||||
hammerjs: 'Hammer',
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
input: 'src/BlueMap.js',
|
||||
external: [ 'three', 'hammerjs' ],
|
||||
plugins: [],
|
||||
output: [
|
||||
{
|
||||
format: 'esm',
|
||||
file: 'build/bluemap.module.js'
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
@ -22,8 +22,9 @@
|
||||
},
|
||||
"homepage": "https://bluecolo.red/bluemap",
|
||||
"dependencies": {
|
||||
"bluemap": "file:./BlueMapWeb",
|
||||
"core-js": "^3.6.5",
|
||||
"hammerjs": "~2.0.8",
|
||||
"three": "~0.123.0",
|
||||
"vue": "^2.6.11",
|
||||
"vue-i18n": "^8.24.1"
|
||||
},
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {animate, EasingFunctions} from "bluemap/src/util/Utils";
|
||||
import {animate, EasingFunctions} from"@/js/util/Utils";
|
||||
import SvgButton from "@/components/ControlBar/SvgButton";
|
||||
|
||||
let animation;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {animate, EasingFunctions} from "bluemap/src/util/Utils";
|
||||
import {animate, EasingFunctions} from "@/js/util/Utils";
|
||||
import SvgButton from "@/components/ControlBar/SvgButton";
|
||||
|
||||
let animation;
|
||||
|
||||
@ -60,7 +60,7 @@ Object3D.prototype.onClick = function(event) {
|
||||
if (!Array.isArray(event.eventStack)) event.eventStack = [];
|
||||
event.eventStack.push(this);
|
||||
|
||||
return this.parent.onClick(event);asd
|
||||
return this.parent.onClick(event);
|
||||
}
|
||||
|
||||
return false;
|
||||
@ -22,20 +22,20 @@
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
import "bluemap/src/BlueMap";
|
||||
import {MapViewer} from "bluemap/src/MapViewer";
|
||||
import {MapControls} from "bluemap/src/controls/map/MapControls";
|
||||
import {FreeFlightControls} from "bluemap/src/controls/freeflight/FreeFlightControls";
|
||||
import "@/js/BlueMap";
|
||||
import {MapViewer} from "@/js/MapViewer";
|
||||
import {MapControls} from "@/js/controls/map/MapControls";
|
||||
import {FreeFlightControls} from "@/js/controls/freeflight/FreeFlightControls";
|
||||
import {FileLoader, MathUtils, Vector3} from "three";
|
||||
import {Map as BlueMapMap} from "bluemap/src/map/Map";
|
||||
import {alert, animate, EasingFunctions, generateCacheHash} from "bluemap/src/util/Utils";
|
||||
import {Map as BlueMapMap} from "@/js/map/Map";
|
||||
import {alert, animate, EasingFunctions, generateCacheHash} from "@/js/util/Utils";
|
||||
import {MainMenu} from "@/js/MainMenu";
|
||||
import {PopupMarker} from "@/js/PopupMarker";
|
||||
import {MarkerSet} from "bluemap/src/markers/MarkerSet";
|
||||
import {MarkerSet} from "@/js/markers/MarkerSet";
|
||||
import {getLocalStorage, round, setLocalStorage} from "@/js/Utils";
|
||||
import i18n from "../i18n";
|
||||
import {PlayerMarkerManager} from "bluemap/src/markers/PlayerMarkerManager";
|
||||
import {NormalMarkerManager} from "bluemap/src/markers/NormalMarkerManager";
|
||||
import {PlayerMarkerManager} from "@/js/markers/PlayerMarkerManager";
|
||||
import {NormalMarkerManager} from "@/js/markers/NormalMarkerManager";
|
||||
|
||||
export class BlueMapApp {
|
||||
|
||||
|
||||
@ -22,9 +22,9 @@
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
import {Marker} from "bluemap/src/markers/Marker";
|
||||
import {CSS2DObject} from "bluemap/src/util/CSS2DRenderer";
|
||||
import {animate, htmlToElement} from "bluemap/src/util/Utils";
|
||||
import {Marker} from "@/js/markers/Marker";
|
||||
import {CSS2DObject} from "@/js/util/CSS2DRenderer";
|
||||
import {animate, htmlToElement} from "@/js/util/Utils";
|
||||
import {BoxGeometry, MeshBasicMaterial, Mesh, Vector2} from "three";
|
||||
import i18n from "../i18n";
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user