+
diff --git a/src/markers/PoiMarker.js b/src/markers/PoiMarker.js
index d8ce187..12cb79b 100644
--- a/src/markers/PoiMarker.js
+++ b/src/markers/PoiMarker.js
@@ -32,9 +32,9 @@ export class PoiMarker extends HtmlMarker {
constructor(markerId) {
super(markerId);
Object.defineProperty(this, 'isPoiMarker', {value: true});
- this.markerType = "poi";
+ this.data.type = "poi";
- this.html = `
![POI Icon (${this.markerId})]()
`;
+ this.html = `
![POI Icon (${this.data.id})]()
`;
this.iconElement = this.element.getElementsByTagName("img").item(0);
this.labelElement = this.element.getElementsByTagName("div").item(0);
@@ -43,13 +43,13 @@ export class PoiMarker extends HtmlMarker {
}
onClick(event) {
- if (this.hightlight) return;
- this.hightlight = true;
+ if (this.highlight) return;
+ this.highlight = true;
let eventHandler = evt => {
if (evt.path.includes(this.element)) return;
- this.hightlight = false;
+ this.highlight = false;
window.removeEventListener("mousedown", eventHandler);
window.removeEventListener("touchstart", eventHandler);
@@ -67,7 +67,7 @@ export class PoiMarker extends HtmlMarker {
return true;
}
- set hightlight(highlight) {
+ set highlight(highlight) {
if (highlight) {
this.element.classList.add("bm-marker-highlight");
} else {
@@ -75,7 +75,7 @@ export class PoiMarker extends HtmlMarker {
}
}
- get hightlight() {
+ get highlight() {
return this.element.classList.contains("bm-marker-highlight");
}
@@ -122,5 +122,4 @@ export class PoiMarker extends HtmlMarker {
}
-
}
\ No newline at end of file
diff --git a/src/markers/ShapeMarker.js b/src/markers/ShapeMarker.js
index 4f1eb00..f22ba28 100644
--- a/src/markers/ShapeMarker.js
+++ b/src/markers/ShapeMarker.js
@@ -39,7 +39,7 @@ export class ShapeMarker extends ObjectMarker {
constructor(markerId) {
super(markerId);
Object.defineProperty(this, 'isShapeMarker', {value: true});
- this.markerType = "shape";
+ this.data.type = "shape";
let zero = new Vector2();
let shape = new Shape([zero, zero, zero]);
diff --git a/src/skybox/SkyFragmentShader.js b/src/skybox/SkyFragmentShader.js
index 720c098..be59e76 100644
--- a/src/skybox/SkyFragmentShader.js
+++ b/src/skybox/SkyFragmentShader.js
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
export const SKY_FRAGMENT_SHADER = `
-uniform float sunlight;
+uniform float sunlightStrength;
uniform float ambientLight;
uniform vec3 skyColor;
@@ -33,7 +33,7 @@ void main() {
float horizonWidth = 0.005;
float horizonHeight = 0.0;
- vec4 color = vec4(skyColor * max(sunlight, ambientLight), 1.0);
+ vec4 color = vec4(skyColor * max(sunlightStrength, ambientLight), 1.0);
float voidMultiplier = (clamp(vPosition.y - horizonHeight, -horizonWidth, horizonWidth) + horizonWidth) / (horizonWidth * 2.0);
color.rgb *= voidMultiplier;
diff --git a/src/skybox/SkyboxScene.js b/src/skybox/SkyboxScene.js
index ef1f193..d8f6236 100644
--- a/src/skybox/SkyboxScene.js
+++ b/src/skybox/SkyboxScene.js
@@ -22,39 +22,23 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-import {BackSide, Color, Mesh, Scene, ShaderMaterial, SphereGeometry} from 'three';
+import {BackSide, Mesh, Scene, ShaderMaterial, SphereGeometry} from 'three';
import {SKY_FRAGMENT_SHADER} from './SkyFragmentShader';
import {SKY_VERTEX_SHADER} from './SkyVertexShader';
export class SkyboxScene extends Scene {
- constructor() {
+ constructor(uniforms) {
super();
this.autoUpdate = false;
- Object.defineProperty( this, 'isSkyboxScene', { value: true } );
-
- this.UNIFORM_sunlight = {
- value: 1
- };
-
- this.UNIFORM_skyColor = {
- value: new Color(0.5, 0.5, 1)
- };
-
- this.UNIFORM_ambientLight = {
- value: 0
- };
+ Object.defineProperty(this, 'isSkyboxScene', {value: true});
let geometry = new SphereGeometry(1, 40, 5);
let material = new ShaderMaterial({
- uniforms: {
- sunlight: this.UNIFORM_sunlight,
- skyColor: this.UNIFORM_skyColor,
- ambientLight: this.UNIFORM_ambientLight,
- },
+ uniforms: uniforms,
vertexShader: SKY_VERTEX_SHADER,
fragmentShader: SKY_FRAGMENT_SHADER,
side: BackSide
@@ -64,46 +48,4 @@ export class SkyboxScene extends Scene {
this.add(skybox);
}
- /**
- * @returns {number}
- */
- get sunlight() {
- return this.UNIFORM_sunlight.value;
- }
-
- /**
- * @param strength {number}
- */
- set sunlight(strength) {
- this.UNIFORM_sunlight.value = strength;
- }
-
- /**
- * @returns {Color}
- */
- get skyColor() {
- return this.UNIFORM_skyColor.value;
- }
-
- /**
- * @param color {Color}
- */
- set skyColor(color) {
- this.UNIFORM_skyColor.value.set(color);
- }
-
- /**
- * @returns {number}
- */
- get ambientLight() {
- return this.UNIFORM_ambientLight.value;
- }
-
- /**
- * @param strength {number}
- */
- set ambientLight(strength) {
- this.UNIFORM_ambientLight.value = strength;
- }
-
}
\ No newline at end of file
diff --git a/src/util/CombinedCamera.js b/src/util/CombinedCamera.js
index 3b85e0a..fb4f81f 100644
--- a/src/util/CombinedCamera.js
+++ b/src/util/CombinedCamera.js
@@ -36,8 +36,39 @@ export class CombinedCamera extends PerspectiveCamera {
constructor(fov, aspect, near, far, ortho) {
super(fov, aspect, near, far);
- this.ortho = ortho;
- this.distance = 1;
+ this.data = {
+ fov: this.fov,
+ aspect: this.aspect,
+ near: this.near,
+ far: this.far,
+ zoom: this.zoom,
+ ortho: ortho,
+ distance: 1,
+ };
+
+ // redirect parent properties
+ Object.defineProperty(this, "fov", {
+ get() { return this.data.fov },
+ set(value) { this.data.fov = value }
+ });
+ Object.defineProperty(this, "aspect", {
+ get() { return this.data.aspect },
+ set(value) { this.data.aspect = value }
+ });
+ Object.defineProperty(this, "near", {
+ get() { return this.data.near },
+ set(value) { this.data.near = value }
+ });
+ Object.defineProperty(this, "far", {
+ get() { return this.data.far },
+ set(value) { this.data.far = value }
+ });
+ Object.defineProperty(this, "zoom", {
+ get() { return this.data.zoom },
+ set(value) { this.data.zoom = value }
+ });
+
+ this.updateProjectionMatrix();
}
updateProjectionMatrix() {
@@ -47,6 +78,9 @@ export class CombinedCamera extends PerspectiveCamera {
if (!this.perspectiveProjection)
this.perspectiveProjection = new Matrix4();
+ if (!this.data)
+ this.data = {};
+
//copied from PerspectiveCamera
const near = this.near;
let top = near * Math.tan( MathUtils.DEG2RAD * 0.5 * this.fov ) / this.zoom;
@@ -117,4 +151,31 @@ export class CombinedCamera extends PerspectiveCamera {
//ignore
}
+ /**
+ * @returns {number}
+ */
+ get ortho() {
+ return this.data.ortho;
+ }
+
+ /**
+ * @param value {number}
+ */
+ set ortho(value) {
+ this.data.ortho = value;
+ }
+
+ /**
+ * @returns {number}
+ */
+ get distance() {
+ return this.data.distance;
+ }
+
+ /**
+ * @param value {number}
+ */
+ set distance(value) {
+ this.data.distance = value;
+ }
}
\ No newline at end of file
