Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
raub committed Aug 30, 2020
1 parent 4a0f097 commit e1909fb
Show file tree
Hide file tree
Showing 9 changed files with 381 additions and 206 deletions.
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,8 @@ The return value will be the same for any number of repeating calls.

Parameter `opts` and all of its fields are optional:

* `[string|function|{name,opts}] plugins` - a list of plugins to initialize.
Plugins are inited the very last. Right before the result of `init()` is returned.
Given the name of the plugin `init()` will try to require it and call it passing
the future-return-value. Plugins are inited in the same order as they present in the
array. You may also pass the plugin as a function, which is equivalent to a manual
call `plugin(initResult)`, where `initResult` is what `init()` returns. Yet even
in this case using the array parameter allows shorter syntax and order control.
* `{} extend` - extend or override the returning fields.
* `number major 2` - major OpenGL version to be used.
* `number minor 1` - minor OpenGL version to be used.
* `string title $PWD` - window title, takes current directory as default.
* `number width 800` - window initial width.
* `number height 600` - window initial height.
Expand All @@ -75,10 +69,18 @@ Parameter `opts` and all of its fields are optional:
* `location` - override for `window.location`.
* `navigator` - override for `window.navigator`.
* `WebVRManager` - override for `window.WebVRManager`.
* `three`, `opts.THREE` - override for module "threejs-raub".
* `three`, `opts.THREE` - override for module "three".
* `[{search,replace}] shaderHacks` - a list of shader replacement rules. Each rule is later
translated into a call of
[String.replace()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
* `[string|function|{name,opts}] plugins` - a list of plugins to initialize.
Plugins are inited the very last. Right before the result of `init()` is returned.
Given the name of the plugin `init()` will try to require it and call it passing
the future-return-value. Plugins are inited in the same order as they present in the
array. You may also pass the plugin as a function, which is equivalent to a manual
call `plugin(initResult)`, where `initResult` is what `init()` returns. Yet even
in this case using the array parameter allows shorter syntax and order control.
* `Object extend` - extend or override the returning fields.


Returns:
Expand Down
2 changes: 1 addition & 1 deletion examples/points-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function addCloud() {
const vbo = gl.createBuffer();
gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(vertices), gl.STATIC_DRAW);
const posAttr = new three.GLBufferAttribute( gl, vbo, gl.FLOAT, 3, REAL_SIZE );
const posAttr = new three.GLBufferAttribute( vbo, gl.FLOAT, 3, 4, REAL_SIZE );
geo.setAttribute( 'position', posAttr );
geo.setDrawRange( 0, REAL_SIZE );

Expand Down
2 changes: 1 addition & 1 deletion examples/three/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const {
Image,
} = initCore();

const getJs = p => require(`threejs-raub/examples/js/${p}`);
const getJs = p => require(`three/examples/js/${p}`);

getJs('postprocessing/EffectComposer');
getJs('postprocessing/RenderPass');
Expand Down
2 changes: 1 addition & 1 deletion js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const _init = (_opts = {}) => {


// Require THREE after Document and GL are ready
const three = opts.three || opts.THREE || require('threejs-raub');
const three = opts.three || opts.THREE || require('three');
global.THREE = three;

require('./core/threejs-helpers')(three, gl);
Expand Down
2 changes: 1 addition & 1 deletion js/objects/cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class Cloud extends Drawable {

buildAttr(source, count) {
return new this.screen.three.GLBufferAttribute(
this.screen.context,
source.vbo,
this.screen.context.FLOAT,
source.items,
4,
count
);
}
Expand Down
80 changes: 40 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": "Luis Blanco <[email protected]>",
"name": "3d-core-raub",
"version": "3.4.0",
"version": "3.5.0",
"description": "An extensible Node3D core for desktop applications",
"license": "MIT",
"main": "index.js",
Expand Down Expand Up @@ -32,10 +32,10 @@
"url": "https://github.com/node-3d/3d-core-raub.git"
},
"dependencies": {
"addon-tools-raub": "5.1.x",
"threejs-raub": "0.115.x",
"addon-tools-raub": "5.2.x",
"three": "0.120.x",
"image-raub": "3.1.x",
"glfw-raub": "4.4.x",
"webgl-raub": "2.0.x"
"glfw-raub": "4.5.x",
"webgl-raub": "2.1.x"
}
}
Loading

0 comments on commit e1909fb

Please sign in to comment.