Globe: Fix bottom when cut

This commit is contained in:
2020-04-21 14:41:26 +02:00
parent 11c95ce4f2
commit faf0c3c96b
5 changed files with 18 additions and 20 deletions

View File

@@ -60,6 +60,7 @@ class WebglGlobe {
// Build // Build
buildWebglScene () { buildWebglScene () {
// Renderer
this.renderer = new Renderer({ this.renderer = new Renderer({
// To allow transparent background on webgl canvas // To allow transparent background on webgl canvas
alpha: true, alpha: true,
@@ -67,6 +68,8 @@ class WebglGlobe {
antialias: window.innerWidth < 768 || window.devicePixelRatio == 1 ? true : false, antialias: window.innerWidth < 768 || window.devicePixelRatio == 1 ? true : false,
}) })
const elParent = document.body
// we put the canvas at the end of body tag as 'position:fixed' // we put the canvas at the end of body tag as 'position:fixed'
// this is to avoid having a too big canvas if the globe needs to be very large: // this is to avoid having a too big canvas if the globe needs to be very large:
// so instead we move the globe as we scroll // so instead we move the globe as we scroll
@@ -75,7 +78,7 @@ class WebglGlobe {
this.renderer.canvas.style.left = 0 this.renderer.canvas.style.left = 0
this.renderer.canvas.style.pointerEvents = 'none' this.renderer.canvas.style.pointerEvents = 'none'
this.renderer.canvas.style.zIndex = 100 this.renderer.canvas.style.zIndex = 100
document.body.appendChild(this.renderer.canvas) elParent.appendChild(this.renderer.canvas)
// The markers DOM nodes wrapper // The markers DOM nodes wrapper
// this wrapper is added just next to the canvas, at the end of body tag // this wrapper is added just next to the canvas, at the end of body tag
@@ -85,8 +88,7 @@ class WebglGlobe {
this.$markerWrapper.style.top = 0 this.$markerWrapper.style.top = 0
this.$markerWrapper.style.left = 0 this.$markerWrapper.style.left = 0
this.$markerWrapper.style.pointerEvents = 'none' this.$markerWrapper.style.pointerEvents = 'none'
this.$markerWrapper.style.zIndex = 101 elParent.appendChild(this.$markerWrapper)
document.body.appendChild(this.$markerWrapper)
// Load worldmap texture // Load worldmap texture
this.texture = Texture.fromUrl(this.renderer.gl, this.options.texture, { this.texture = Texture.fromUrl(this.renderer.gl, this.options.texture, {
@@ -282,10 +284,10 @@ class WebglGlobe {
// Destroy // Destroy
destroy () { destroy () {
this.disable()//stop render loop this.disable() // Stop render loop
document.body.removeChild(this.$markerWrapper) document.body.removeChild(this.$markerWrapper)
document.body.removeChild(this.renderer.canvas) document.body.removeChild(this.renderer.canvas)
this.camera.delete()//to remove event listeners this.camera.delete() // To remove event listeners
} }
/** /**

View File

@@ -1,5 +1,6 @@
// Colors // Colors
$color-primary: #3C0576; $color-primary: #3C0576;
$color-primary-darker: #2D0458;
$color-secondary: #FF6C89; $color-secondary: #FF6C89;
$color-secondary-bright: #FF0536; $color-secondary-bright: #FF0536;
$color-text: #333; $color-text: #333;
@@ -9,16 +10,8 @@ $color-gray: #666;
$color-lightgray: #999; $color-lightgray: #999;
// CSS Variables // CSS Variables
:root { // :root {
// Colors // }
--color-primary: #{$color-primary};
--color-secondary: #{$color-secondary};
--color-text: #{$color-text};
--color-tertiary: #{$color-tertiary};
--color-lightpurple: #{$color-lightpurple};
--color-gray: #{$color-gray};
--color-lightgray: #{$color-lightgray};
}
/* Fonts /* Fonts

View File

@@ -1,6 +1,7 @@
// Main page // Main page
.housesof { .housesof {
position: absolute; position: absolute;
z-index: 120;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;

View File

@@ -46,6 +46,8 @@
** Markers ** Markers
*/ */
&__markers { &__markers {
z-index: 210;
// When dragging // When dragging
&.is-grabbing { &.is-grabbing {
cursor: grabbing; cursor: grabbing;

View File

@@ -2,7 +2,7 @@
FOOTER FOOTER
========================================================================== */ ========================================================================== */
.footer { .footer {
background-color: #2D0458; background-color: $color-primary-darker;
.wrap { .wrap {
display: block; display: block;