-
Notifications
You must be signed in to change notification settings - Fork 31
chore: bump to deck 9.1 #285
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 37 commits
957466c
e63204f
03a2f0f
8c419bf
02ffe2f
0e6eeae
621f594
465f103
fcfd2d9
cf8a4ea
9e69a10
5e8d373
290b99c
485e7db
fdb6e24
256fe24
a6f0a4c
fce220c
d2ea066
69c4da2
93f7f59
6334935
4967fc8
5e79461
5bbf88a
093ab76
b7ce53a
b011b98
c4e99fe
52af878
57d31c3
cc61f96
547d5e8
b299616
20d76c7
b6ac51f
00272be
9807328
3204ff6
46b66a5
57fc004
dcd38a2
7bbed20
1a069de
c339bf9
0f61f3d
fa014a0
46193b3
877c8da
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ coverage/ | |
| .cache/ | ||
|
|
||
| tsconfig.tsbuildinfo | ||
| tsconfig.build.tsbuildinfo | ||
|
|
||
| */**/yarn.lock | ||
| !website/yarn.lock | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,8 +3,8 @@ | |
| <!-- deck.gl standalone bundle --> | ||
| <script src="https://unpkg.com/[email protected]/dist.min.js"></script> | ||
| <script src="https://unpkg.com/[email protected]/dist.min.js"></script> | ||
| <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.1/mapbox-gl.js'></script> | ||
| <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.1/mapbox-gl.css' rel='stylesheet' /> | ||
| <script src="https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.1/mapbox-gl.js"></script> | ||
| <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.1/mapbox-gl.css" rel="stylesheet" /> | ||
| <style> | ||
| body {margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;} | ||
| #geo, #non-geo {position: absolute; width: 50vw; height: 50vh;} | ||
|
|
@@ -14,21 +14,26 @@ | |
| z-index: 1; | ||
| top: 0; | ||
| right: 0; | ||
| background-color: #FFF; | ||
| background-color: #fff; | ||
| margin: 24px; | ||
| padding: 10px 24px; | ||
| box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px; | ||
| min-width: 300px; | ||
| } | ||
| .render-result h3 { font-size: 16px; margin: 8px 0; } | ||
| #re-render { margin-top: 8px; } | ||
| .render-result h3 { | ||
| font-size: 16px; | ||
| margin: 8px 0; | ||
| } | ||
| #re-render { | ||
| margin-top: 8px; | ||
| } | ||
| #result { | ||
| display: none; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div id="non-geo" ></div> | ||
| <div id="non-geo"></div> | ||
| <div class="render-result"> | ||
| <h3 id="render-status">Rendering video...</h3> | ||
| <div id="result"> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,20 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>hubble.gl Example</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <style> | ||
| body {margin: 0; font-family: sans-serif; width: 100vw; height: 100vh; overflow: hidden;} | ||
| #app {width: 100%; height: 100%;} | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| </body> | ||
| <script type="module"> | ||
| import {renderToDOM} from './app.jsx'; | ||
| renderToDOM(document.getElementById('app')); | ||
| </script> | ||
| <head> | ||
| <link href="https://api.mapbox.com/gl-js-seats/v2.13.0/mapbox-gl-seats.css" rel="stylesheet" /> | ||
| <meta charset="utf-8" /> | ||
| <title>hubble.gl Example</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <style> | ||
| body {margin: 0; font-family: sans-serif; width: 100vw; height: 100vh; overflow: hidden;} | ||
| #app {width: 100%; height: 100%;} | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div id="app"></div> | ||
| </body> | ||
| <script type="module"> | ||
| import {renderToDOM} from './app.jsx'; | ||
| renderToDOM(document.getElementById('app')); | ||
| </script> | ||
| </html> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| import React, {useState, useRef, useEffect} from 'react'; | ||
| import {createRoot} from 'react-dom/client'; | ||
| import DeckGL from '@deck.gl/react'; | ||
| import {DeckGL} from '@deck.gl/react'; | ||
| import {useHubbleGl, BasicControls} from '@hubble.gl/react'; | ||
| import {vignette, fxaa} from '@luma.gl/shadertools'; | ||
| import {vignette, fxaa} from '@luma.gl/effects'; | ||
| import {PostProcessEffect, MapView} from '@deck.gl/core'; | ||
| import {deckAnimation} from './layers'; | ||
| import {easeInOut} from 'popmotion'; | ||
| import {deckAnimation} from './layers'; | ||
|
|
||
| const INITIAL_VIEW_STATE = { | ||
| longitude: -122.435, | ||
|
|
@@ -108,12 +108,18 @@ export default function App() { | |
| <Container> | ||
| <div style={{position: 'relative'}}> | ||
| <DeckGL | ||
| ref={ref => deckRef.current = ref?.deck} | ||
| ref={ref => (deckRef.current = ref?.deck)} | ||
| style={{position: 'unset'}} | ||
| views={new MapView({farZMultiplier: 3})} | ||
| views={ | ||
| new MapView({ | ||
| farZMultiplier: 3, | ||
| clear: { | ||
| color: [61 / 255, 20 / 255, 76 / 255, 1] | ||
| } | ||
| }) | ||
|
Comment on lines
+114
to
+119
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah Ive struggled to get that working, but as I integrate it into my codebase, Ill have much more time to learn and explore its internals. Let me know when the release goes live. Thanks! |
||
| } | ||
| parameters={{ | ||
| depthTest: false, | ||
| clearColor: [61 / 255, 20 / 255, 76 / 255, 1] | ||
| depthTest: false | ||
| // blend: true, | ||
| // blendEquation: GL.FUNC_ADD, | ||
| // blendFunc: [GL.SRC_ALPHA, GL.ONE_MINUS_SRC_ALPHA] | ||
|
|
||

Uh oh!
There was an error while loading. Please reload this page.