diff --git a/src/core/engine/CopyShader.js b/src/core/engine/CopyShader.js index f8a71fb7e5..afed95ae63 100755 --- a/src/core/engine/CopyShader.js +++ b/src/core/engine/CopyShader.js @@ -1,7 +1,7 @@ // jscs:disable /* eslint-disable */ -import THREE from 'three'; +import * as THREE from '../three'; /** * @author alteredq / http://alteredqualia.com/ @@ -51,4 +51,3 @@ var CopyShader = { }; export default CopyShader; -THREE.CopyShader = CopyShader; diff --git a/src/core/engine/MaskPass.js b/src/core/engine/MaskPass.js index e7a35d2c7a..b4f965bbb7 100755 --- a/src/core/engine/MaskPass.js +++ b/src/core/engine/MaskPass.js @@ -1,7 +1,7 @@ // jscs:disable /* eslint-disable */ -import THREE from 'three'; +import * as THREE from '../three'; /** * @author alteredq / http://alteredqualia.com/ @@ -92,6 +92,3 @@ ClearMaskPass.prototype = { export default MaskPass; export {ClearMaskPass as ClearMaskPass}; - -THREE.MaskPass = MaskPass; -THREE.ClearMaskPass = ClearMaskPass; diff --git a/src/core/engine/ShaderPass.js b/src/core/engine/ShaderPass.js index 9687ffb0c9..6e91880e81 100755 --- a/src/core/engine/ShaderPass.js +++ b/src/core/engine/ShaderPass.js @@ -1,7 +1,7 @@ // jscs:disable /* eslint-disable */ -import THREE from 'three'; +import * as THREE from '../three'; /** * @author alteredq / http://alteredqualia.com/ @@ -37,7 +37,7 @@ var ShaderPass = function( shader, textureID ) { this.enabled = true; this.needsSwap = true; - this.clear = false; + this.clear = true; this.camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 ); @@ -51,17 +51,14 @@ var ShaderPass = function( shader, textureID ) { ShaderPass.prototype = { render: function( renderer, writeBuffer, readBuffer, delta ) { - if ( this.uniforms[ this.textureID ] ) { - - this.uniforms[ this.textureID ].value = readBuffer; + this.uniforms[ this.textureID ].value = readBuffer.texture; } - + renderer.autoClear = false; this.quad.material = this.material; if ( this.renderToScreen ) { - renderer.render( this.scene, this.camera ); } else { @@ -69,10 +66,9 @@ ShaderPass.prototype = { renderer.render( this.scene, this.camera, writeBuffer, this.clear ); } - + renderer.autoClear = true; } }; export default ShaderPass; -THREE.ShaderPass = ShaderPass; diff --git a/src/core/engine/composer.js b/src/core/engine/composer.js index 319a1c9f8c..0f40b99806 100755 --- a/src/core/engine/composer.js +++ b/src/core/engine/composer.js @@ -1,7 +1,7 @@ // jscs:disable /* eslint-disable */ -import THREE from 'three'; +import * as THREE from '../three'; import CopyShader from './CopyShader'; import ShaderPass from './ShaderPass'; import MaskPass, {ClearMaskPass} from './MaskPass'; @@ -50,7 +50,8 @@ EffectComposer.prototype = { this.writeBuffer = tmp; }, - + visible:true, + type:'composer', addPass: function ( pass ) { this.passes.push( pass ); @@ -71,7 +72,6 @@ EffectComposer.prototype = { var maskActive = false; var pass, i, il = this.passes.length; - for ( i = 0; i < il; i ++ ) { pass = this.passes[ i ]; @@ -147,4 +147,3 @@ EffectComposer.prototype = { }; export default EffectComposer; -THREE.EffectComposer = EffectComposer; diff --git a/src/core/engine/index.js b/src/core/engine/index.js index a12f2e06f6..a08bc77d76 100644 --- a/src/core/engine/index.js +++ b/src/core/engine/index.js @@ -16,14 +16,16 @@ export default class Engine extends EventEmitter { this._scene.add(this.world); this._picking = Picking(this._world, this._renderer, this._camera, this._scene); this.clock = new THREE.Clock(); + this.composerLayers = []; } _initPostProcessing() { - + this.composerLayers.forEach(layer => { + layer.visible && layer.render(); + }); } update() { - this._renderer.render(this._scene, this._camera); - + this._initPostProcessing(); } destroy() { diff --git a/src/core/engine/renderpass.js b/src/core/engine/renderpass.js index f6d3f0c0df..ea50efc8a0 100644 --- a/src/core/engine/renderpass.js +++ b/src/core/engine/renderpass.js @@ -1,45 +1,61 @@ +// jscs:disable +/* eslint-disable */ + import * as THREE from '../three'; -export default class RenderPass { - constructor(cfg) { - this.scene; - this.camera = cfg.camera; - this.renderer = cfg.renderer; - this.clearColor = cfg.clear.clearColor; - this.clearAlpha = cfg.clear.clearAlpha; - this.size = cfg.size ? cfg.size : cfg.renderer.getSize(); - const defaultRenderCfg = { - minFilter: THREE.NearestFilter, - magFilter: THREE.NearestFilter, - format: THREE.RGBAFormat, - stencilBuffer: false, - depthBuffer: false - }; - this.renderCfg = cfg.renderCfg ? cfg.renderCfg : defaultRenderCfg; - this._init(cfg); - } +/** + * @author alteredq / http://alteredqualia.com/ + */ - _init() { - this.scene = new THREE.Scene(); - this.pass = new THREE.WebGLRenderTarget(this.size.width, this.size.height, this.renderCfg); - this.originClearColor = this.renderer.getClearColor(); - this.originClearAlpha = this.renderer.getClearAlpha(); - this.texture = this.pass.texture; - } +var RenderPass = function ( scene, camera, overrideMaterial, clearColor, clearAlpha ) { - add(mesh) { - this.scene.add(mesh); - } + this.scene = scene; + this.camera = camera; - remove(mesh) { - this.scene.remove(mesh); - } + this.overrideMaterial = overrideMaterial; - render() { + this.clearColor = clearColor; + this.clearAlpha = ( clearAlpha !== undefined ) ? clearAlpha : 1; - this.renderer.setClearColor(this.clearColor, this.clearAlpha); - this.renderer.render(this.scene, this.camera, this.pass, true); - this.renderer.setRenderTarget(null); - this.renderer.setClearColor(this.originClearColor, this.originClearAlpha); - } -} + this.oldClearColor = new THREE.Color(); + this.oldClearAlpha = 1; + + this.enabled = true; + this.clear = false; + this.needsSwap = false; + +}; + +RenderPass.prototype = { + + render: function ( renderer, writeBuffer, readBuffer, delta ) { + + this.scene.overrideMaterial = this.overrideMaterial; + const oldAutoClear = renderer.autoClear; + // renderer.autoClear = false; + if ( this.clearColor ) { + + this.oldClearColor.copy( renderer.getClearColor() ); + this.oldClearAlpha = renderer.getClearAlpha(); + + renderer.setClearColor( this.clearColor, this.clearAlpha ); + + } + + renderer.render( this.scene, this.camera, readBuffer, this.clear ); + // if(this.clear)renderer.clear( renderer.autoClearColor, renderer.autoClearDepth, renderer.autoClearStencil ); + + if ( this.clearColor ) { + + renderer.setClearColor( this.oldClearColor, this.oldClearAlpha ); + + } + + this.scene.overrideMaterial = null; + renderer.autoClear = oldAutoClear; + + } + +}; + +export default RenderPass; diff --git a/src/core/layer.js b/src/core/layer.js index 9d7e3fea00..4905fba8ee 100644 --- a/src/core/layer.js +++ b/src/core/layer.js @@ -79,8 +79,14 @@ export default class Layer extends Base { * @param {*} type mesh类型是区别是填充还是边线 */ add(object, type = 'fill') { - type === 'fill' ? this.layerMesh = object : this.layerLineMesh = object; + // composer合图层绘制 + if (object.type === 'composer') { + this._object3D = object; + this.scene._engine.composerLayers.push(object); + return; + } + type === 'fill' ? this.layerMesh = object : this.layerLineMesh = object; this._visibleWithZoom(); this._zoomchangeHander = this._visibleWithZoom.bind(this); this.scene.on('zoomchange', this._zoomchangeHander); @@ -105,6 +111,12 @@ export default class Layer extends Base { } } remove(object) { + if (object.type === 'composer') { + this.scene._engine.composerLayers = this.scene._engine.composerLayers.filter(layer => { + return (layer !== object); + }); + return; + } this._object3D.remove(object); } _getUniqueId() { @@ -601,6 +613,11 @@ export default class Layer extends Base { */ destroy() { this.removeAllListeners(); + if (this._object3D.type === 'composer') { + this.remove(this._object3D); + + return; + } if (this._object3D && this._object3D.children) { let child; for (let i = 0; i < this._object3D.children.length; i++) { diff --git a/src/core/source.js b/src/core/source.js index 1f8ca665ee..b57125ac15 100644 --- a/src/core/source.js +++ b/src/core/source.js @@ -58,7 +58,6 @@ export default class Source extends Base { createScale(field) { const data = this.data.dataArray; const scales = this.get('scales'); - console.log(scales); let scale = scales[field]; const scaleController = this.get('scaleController'); if (!scale) { diff --git a/src/core/three.js b/src/core/three.js index 07bc1261c0..63c37b9ac8 100644 --- a/src/core/three.js +++ b/src/core/three.js @@ -16,6 +16,7 @@ export { OrthographicCamera } from 'three/src/cameras/OrthographicCamera.js'; export { BufferGeometry } from 'three/src/core/BufferGeometry.js'; export { PlaneBufferGeometry } from 'three/src/geometries/PlaneGeometry.js'; export { Raycaster } from 'three/src/core/Raycaster.js'; +export { UniformsUtils } from 'three/src/renderers/shaders/UniformsUtils.js'; export { Matrix4 } from 'three/src/math/Matrix4.js'; export { Matrix3 } from 'three/src/math/Matrix3.js'; export { Line } from 'three/src/objects/Line.js'; diff --git a/src/geom/material/heatmapMateial.js b/src/geom/material/heatmapMateial.js index c3fbd88efa..315d19c7b9 100644 --- a/src/geom/material/heatmapMateial.js +++ b/src/geom/material/heatmapMateial.js @@ -13,6 +13,7 @@ export function HeatmapIntensityMaterial(opt) { vertexShader: vs, fragmentShader: fs, transparent: true, + depthTest: false, blending: THREE.AdditiveBlending }); return material; diff --git a/src/layer/heatmapLayer.js b/src/layer/heatmapLayer.js index 0a6931bfb2..ae8e34b1df 100644 --- a/src/layer/heatmapLayer.js +++ b/src/layer/heatmapLayer.js @@ -2,7 +2,7 @@ import Layer from '../core/layer'; import gridBuffer from '../geom/buffer/heatmap/grid'; import DrawGrid from './render/heatmap/gird'; import DrawHexagon from './render/heatmap/hexagon'; -import { drawHeatmap, updateIntensityPass } from './render/heatmap/heatmap'; +import { drawHeatmap } from './render/heatmap/heatmap'; import hexagonBuffer from '../geom/buffer/heatmap/hexagon'; export default class HeatMapLayer extends Layer { @@ -56,10 +56,10 @@ export default class HeatMapLayer extends Layer { this.add(girdMesh); } - afterRender() { - if (this.shapeType !== 'grid' && this.shapeType !== 'hexagon') { - updateIntensityPass(this); - } - } + // afterRender() { + // if (this.shapeType !== 'grid' && this.shapeType !== 'hexagon') { + // updateIntensityPass(this); + // } + // } } diff --git a/src/layer/render/heatmap/heatmap.js b/src/layer/render/heatmap/heatmap.js index 488bbec286..287d9dc893 100644 --- a/src/layer/render/heatmap/heatmap.js +++ b/src/layer/render/heatmap/heatmap.js @@ -1,21 +1,32 @@ import HeatmapBuffer from '../../../geom/buffer/heatmap/heatmap'; import { createColorRamp } from '../../../geom/buffer/heatmap/heatmap'; import { HeatmapIntensityMaterial, HeatmapColorizeMaterial } from '../../../geom/material/heatmapMateial'; -import Renderpass from '../../../core/engine/renderpass'; +// import Renderpass from '../../../core/engine/renderpass.bak'; +import Renderpass from '../../../core/engine/renderPass'; +import ShaderPass from '../../../core/engine/ShaderPass'; +import EffectComposer from '../../../core/engine/EffectComposer'; import * as THREE from '../../../core/three'; export function drawHeatmap(layer) { - const bbox = calBoundingBox(layer.layerData); - layer.dataBbox = bbox; + const colors = layer.get('styleOptions').rampColors; layer.colorRamp = createColorRamp(colors); - createIntensityPass(layer, bbox); - createColorizePass(layer, bbox); + const heatmap = new heatmapPass(layer); + const copy = new copyPass(layer); + copy.renderToScreen = true; + const composer = new EffectComposer(layer.scene._engine._renderer, layer.scene._container); + composer.addPass(heatmap); + composer.addPass(copy); + layer.add(composer); + } -function createIntensityPass(layer, bbox) { + +function heatmapPass(layer) { + const scene = new THREE.Scene(); const style = layer.get('styleOptions'); const data = layer.layerData; + const camera = layer.scene._engine._camera; // get attributes data const buffer = new HeatmapBuffer({ data @@ -27,109 +38,26 @@ function createIntensityPass(layer, bbox) { geometry.addAttribute('position', new THREE.Float32BufferAttribute(attributes.vertices, 3)); geometry.addAttribute('a_dir', new THREE.Float32BufferAttribute(attributes.dirs, 2)); geometry.addAttribute('a_weight', new THREE.Float32BufferAttribute(attributes.weights, 1)); - // set material const material = new HeatmapIntensityMaterial({ intensity: style.intensity, radius: style.radius, zoom: layer.scene.getZoom() }); const mesh = new THREE.Mesh(geometry, material); - // set camera - const passOrth = new THREE.OrthographicCamera(bbox.width / -2, bbox.width / 2, bbox.height / 2, bbox.height / -2, 1, 10000); - passOrth.position.set(bbox.minX + bbox.width / 2, bbox.minY + bbox.height / 2, 1000); - // renderpass - const renderer = layer.scene._engine._renderer; - // get extension for bilinear texture interpolation:https://threejs.org/docs/#api/en/textures/DataTexture - /* const gl = renderer.domElement.getContext('webgl') || - renderer.domElement.getContext('experimental-webgl'); - gl.getExtension('OES_texture_float_linear');*/ - const renderpass = new Renderpass({ - renderer, - camera: passOrth, - size: { - width: 2000, - height: 2000 * (bbox.height / bbox.width) - }, - clear: { - clearColor: 0x000000, - clearAlpha: 0.0 - }, - renderCfg: { - wrapS: THREE.ClampToEdgeWrapping, - wrapT: THREE.ClampToEdgeWrapping, - minFilter: THREE.LinearFilter, - magFilter: THREE.LinearFilter, - format: THREE.RGBAFormat, - stencilBuffer: false, - depthBuffer: false - } - }); - renderpass.add(mesh); - renderpass.render(); - layer.intensityPass = renderpass; - layer.intensityMesh = mesh; - updateIntensityPass(layer); + scene.add(mesh); + scene.onBeforeRender = () => { // 每次渲染前改变状态 + const zoom = layer.scene.getZoom(); + mesh.material.setUniformsValue('u_zoom', zoom); + }; + const pass = new Renderpass(scene, camera); + return pass; } - -export function updateIntensityPass(layer) { - const mesh = layer.intensityMesh; - const zoom = layer.scene.getZoom(); - const bbox = layer.dataBbox; - mesh.material.uniforms.u_zoom.value = zoom; - const passWidth = Math.min(8000, Math.pow(zoom, 2.0) * 250); - const passHeight = passWidth * (bbox.height / bbox.width); - layer.intensityPass.pass.setSize(passWidth, passHeight); - layer.intensityPass.render(); -} - -function createColorizePass(layer, bbox) { - // create plane geometry +function copyPass(layer) { const style = layer.get('styleOptions'); - const geometery = new THREE.PlaneBufferGeometry(bbox.width, bbox.height); const material = new HeatmapColorizeMaterial({ - texture: layer.intensityPass.texture, colorRamp: layer.colorRamp, opacity: style.opacity }); - const mesh = new THREE.Mesh(geometery, material); - mesh.position.set(bbox.minX + bbox.width / 2, bbox.minY + bbox.height / 2, 0.0); - layer.add(mesh); -} - -function calBoundingBox(data) { - let minX = Infinity; - let minY = Infinity; - let maxX = -Infinity; - let maxY = -Infinity; - for (let i = 0; i < data.length; i++) { - const p = data[i].coordinates; - if (p[0] < minX) { - minX = p[0]; - } else if (p[0] > maxX) { - maxX = p[0]; - } - if (p[1] < minY) { - minY = p[1]; - } else if (p[1] > maxY) { - maxY = p[1]; - } - } - - minX -= ((maxX - minX) * 0.5); - maxX += ((maxX - minX) * 0.5); - minY -= ((maxY - minY) * 0.5); - maxY += ((maxY - minY) * 0.5); - - const width = maxX - minX; - const height = maxY - minY; - - - return { - minX, - maxX, - minY, - maxY, - width, - height - }; + const copyPass = new ShaderPass(material, 'u_texture'); + return copyPass; } diff --git a/src/map/AMap.js b/src/map/AMap.js index 46760f7379..29374ad778 100644 --- a/src/map/AMap.js +++ b/src/map/AMap.js @@ -55,8 +55,6 @@ export default class GaodeMap extends Base { asyncCamera(engine) { this._engine = engine; const camera = engine._camera; - const scene = engine._scene; - const pickScene = engine._picking._pickingScene; this.map.on('camerachange', e => { const mapCamera = e.camera; let { fov, near, far, height, pitch, rotation, aspect } = mapCamera; @@ -70,15 +68,16 @@ export default class GaodeMap extends Base { camera.position.z = height * Math.cos(pitch); camera.position.x = height * Math.sin(pitch) * Math.sin(rotation); camera.position.y = -height * Math.sin(pitch) * Math.cos(rotation); - camera.up.x = -Math.cos(pitch) * Math.sin(rotation); camera.up.y = Math.cos(pitch) * Math.cos(rotation); camera.up.z = Math.sin(pitch); camera.lookAt(0, 0, 0); - scene.position.x = -e.camera.position.x; - scene.position.y = e.camera.position.y; - pickScene.position.x = -e.camera.position.x; - pickScene.position.y = e.camera.position.y; + camera.position.x += e.camera.position.x; + camera.position.y += -e.camera.position.y; + // scene.position.x = -e.camera.position.x; + // scene.position.y = e.camera.position.y; + // pickScene.position.x = -e.camera.position.x; + // pickScene.position.y = e.camera.position.y; }); } diff --git a/test/unit/source/transfrom/cluster-spec.js b/test/unit/source/transfrom/cluster-spec.js index 845fc2eef7..f46ed7c23a 100644 --- a/test/unit/source/transfrom/cluster-spec.js +++ b/test/unit/source/transfrom/cluster-spec.js @@ -17,13 +17,7 @@ describe('hexagon Test', function() { dataArray, extent: [ -180, -85, 180, 85 ] }; - console.time('cluster'); const grid = cluster(data, { radius: 40, field: 'v', zoom: 13 }); - console.log(grid); - console.timeEnd('cluster'); expect(grid.dataArray.length).eql(26); - console.time('cluster'); - cluster(data, {zoom:14}); - console.timeEnd('cluster'); }); });