p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove track

This commit is contained in:
thinkinggis 2019-03-01 12:03:04 +08:00
parent 8b1a15851c
commit da4810903e
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -53,7 +53,8 @@
"string-replace-loader": "~1.3.0", "string-replace-loader": "~1.3.0",
"torchjs": "~2.1.0", "torchjs": "~2.1.0",
"uglify-js": "~3.1.10", "uglify-js": "~3.1.10",
"webpack": "~3.10.0", "webpack": "~4.29.6",
"webpack-cli": "^3.2.3",
"worker-loader": "^2.0.0" "worker-loader": "^2.0.0"
}, },
"scripts": { "scripts": {

4
src/core/scene.js
View File

@ -2,7 +2,7 @@ import Engine from './engine';
import { LAYER_MAP } from '../layer'; import { LAYER_MAP } from '../layer';
import Base from './base'; import Base from './base';
import LoadImage from './image'; import LoadImage from './image';
import WorkerPool from './worker'; // import WorkerPool from './worker';
// import { MapProvider } from '../map/AMap'; // import { MapProvider } from '../map/AMap';
import { getMap } from '../map/index'; import { getMap } from '../map/index';
import Global from '../global'; import Global from '../global';
@ -22,7 +22,7 @@ export default class Scene extends Base {
_initEngine(mapContainer) { _initEngine(mapContainer) {
this._engine = new Engine(mapContainer, this); this._engine = new Engine(mapContainer, this);
this._engine.run(); this._engine.run();
this.workerPool = new WorkerPool(); // this.workerPool = new WorkerPool();
compileBuiltinModules(); compileBuiltinModules();
} }
// 为pickup场景添加 object 对象 // 为pickup场景添加 object 对象

1
src/index.js
View File

@ -7,7 +7,6 @@ const version = Global.version;
const track = function(enable) { const track = function(enable) {
Global.trackable = enable; Global.trackable = enable;
}; };
import './track';
export { export {
version, version,
Scene, Scene,

48
src/layer/pointLayer.js
View File

@ -42,33 +42,33 @@ export default class PointLayer extends Layer {
switch (pointShapeType) { switch (pointShapeType) {
case 'fill' :// 填充图形 case 'fill' :// 填充图形
{ {
if (fill !== 'none') { // 是否填充 if (fill !== 'none') { // 是否填充
const attributes = PointBuffer.FillBuffer(this.layerData, style); const attributes = PointBuffer.FillBuffer(this.layerData, style);
const meshfill = drawPoint.DrawFill(attributes, this.get('styleOptions')); const meshfill = drawPoint.DrawFill(attributes, this.get('styleOptions'));
this.add(meshfill); this.add(meshfill);
}
if (stroke !== 'none') { // 是否绘制边界
const lineAttribute = PointBuffer.StrokeBuffer(this.layerData, style);
const meshStroke = drawPoint.DrawStroke(lineAttribute, this.get('styleOptions'));
this.add(meshStroke, 'line');
}
break;
} }
if (stroke !== 'none') { // 是否绘制边界
const lineAttribute = PointBuffer.StrokeBuffer(this.layerData, style);
const meshStroke = drawPoint.DrawStroke(lineAttribute, this.get('styleOptions'));
this.add(meshStroke, 'line');
}
break;
}
case 'image':// 绘制图片标注 case 'image':// 绘制图片标注
{ {
const imageAttribute = PointBuffer.ImageBuffer(this.layerData, { imagePos: this.scene.image.imagePos }); const imageAttribute = PointBuffer.ImageBuffer(this.layerData, { imagePos: this.scene.image.imagePos });
const imageMesh = drawPoint.DrawImage(imageAttribute, { ...style, texture: this.scene.image.texture }); const imageMesh = drawPoint.DrawImage(imageAttribute, { ...style, texture: this.scene.image.texture });
this.add(imageMesh); this.add(imageMesh);
break; break;
} }
case 'normal' : // 原生点 case 'normal' : // 原生点
{ {
const normalAttribute = PointBuffer.NormalBuffer(this.layerData, style); const normalAttribute = PointBuffer.NormalBuffer(this.layerData, style);
const normalPointMesh = drawPoint.DrawNormal(normalAttribute, style); const normalPointMesh = drawPoint.DrawNormal(normalAttribute, style);
this.add(normalPointMesh); this.add(normalPointMesh);
break; break;
} }
default: default:
return null; return null;
} }