Skip to content

Commit

Permalink
Merge pull request #302 from vanruesc/dev
Browse files Browse the repository at this point in the history
Version 6.22.0
  • Loading branch information
vanruesc authored May 30, 2021
2 parents ba6276b + ff5d26c commit 0b99905
Show file tree
Hide file tree
Showing 9 changed files with 134 additions and 102 deletions.
11 changes: 10 additions & 1 deletion demo/src/demos/ColorGradingDemo.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ export class ColorGradingDemo extends PostProcessingDemo {

registerOptions(menu) {

const capabilities = this.composer.getRenderer().capabilities;
const renderer = this.composer.getRenderer();
const context = renderer.getContext();
const capabilities = renderer.capabilities;
const assets = this.assets;
const luts = this.luts;

Expand Down Expand Up @@ -446,6 +448,13 @@ export class ColorGradingDemo extends PostProcessingDemo {

if(capabilities.isWebGL2) {

if(context.getExtension("OES_texture_float_linear") === null) {

console.log("Linear float filtering not supported, converting to Uint8");
lut.convertToUint8();

}

lutEffect.setLUT(params.lut["3D texture"] ? lut : lut.toDataTexture());

} else {
Expand Down
2 changes: 1 addition & 1 deletion demo/src/demos/PostProcessingDemo.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class PostProcessingDemo extends Demo {
super(id);

/**
* Spatial controls
* Spatial controls.
*
* @type {SpatialControls}
* @protected
Expand Down
2 changes: 1 addition & 1 deletion demo/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function render(timestamp) {

window.addEventListener("load", (event) => {

const debug = (window.location.href.indexOf("localhost") !== -1);
const debug = (window.location.hostname === "localhost");
const viewport = document.getElementById("viewport");
const demoCache = new WeakSet();

Expand Down
2 changes: 1 addition & 1 deletion demo/static/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ p {
}

.dg ul {
max-height: 80vh;
max-height: calc(100vh - 20px);
overflow: auto;
scrollbar-width: thin;
}
Expand Down
5 changes: 5 additions & 0 deletions esbuild.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ await esbuild.build({
],
outExtension: { ".js": ".txt" },
outdir: "tmp",
logLevel: "info",
format: "iife",
bundle: true,
minify,
Expand All @@ -32,6 +33,7 @@ await esbuild.build({
await esbuild.build({
entryPoints: ["demo/src/index.js"],
outdir: "public/demo",
logLevel: "info",
format: "iife",
bundle: true,
plugins,
Expand All @@ -43,6 +45,7 @@ await esbuild.build({
entryPoints: ["src/index.js"],
outfile: `build/${pkg.name}.esm.js`,
banner: { js: banner },
logLevel: "info",
format: "esm",
bundle: true,
external,
Expand All @@ -59,6 +62,7 @@ await esbuild.build({
outfile: `build/${pkg.name}.js`,
banner: { js: `${banner}\n${requireShim}` },
footer: { js: footer },
logLevel: "info",
format: "iife",
bundle: true,
globalName,
Expand All @@ -71,6 +75,7 @@ await esbuild.build({
outfile: `build/${pkg.name}.min.js`,
banner: { js: `${banner}\n${requireShim}` },
footer: { js: footer },
logLevel: "info",
format: "iife",
bundle: true,
globalName,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "postprocessing",
"version": "6.21.5",
"version": "6.22.0",
"description": "A post processing library that provides the means to implement image filter effects for three.js.",
"homepage": "https://github.com/vanruesc/postprocessing",
"main": "build/postprocessing.js",
Expand Down Expand Up @@ -70,7 +70,7 @@
"extends": "aether"
},
"peerDependencies": {
"three": ">= 0.102.0 < 0.129.0"
"three": ">= 0.102.0 < 0.130.0"
},
"devDependencies": {
"@types/three": "0.x.x",
Expand Down
Loading

0 comments on commit 0b99905

Please sign in to comment.