Skip to content

Commit 4866115

Browse files
committed
Adjust according to review
1 parent 990c565 commit 4866115

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ pythreejs/traits.py
6767
# Overridden classes
6868
js/src/core/Object3D.js
6969
js/src/textures/DataTexture.js
70-
js/src/textures/ImageTexture.js # custom classed created to ease image texture loading
7170
js/src/renderers/WebGLRenderer.js
7271
pythreejs/core/Object3D.py
7372
pythreejs/renderers/WebGLRenderer.py
7473
74+
# Custom classes
75+
js/src/textures/ImageTexture.js # created to ease image texture loading
76+
js/src/textures/TextTexture.js # created to ease creation of textures of rasterized text
77+
7578
# Updated examples notesbooks
7679
examples/Examples.ipynb
7780
examples/Geometries.ipynb

js/scripts/prop-types.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ _.extend(BaseType.prototype, {
2222
},
2323
})
2424

25-
function ThreeType(typeName, nullable=true) {
25+
function ThreeType(typeName, options={}) {
2626
this.typeName = typeName;
2727
this.defaultValue = null;
2828
this.serialize = true;
29-
this.nullable = nullable;
29+
this.nullable = bool(options.nullable);
3030
}
3131
_.extend(ThreeType.prototype, BaseType.prototype, {
3232
getTraitlet: function() {

js/scripts/three-class-config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,8 @@ module.exports = {
862862
encoding: new Types.Enum('TextureEncodings', 'LinearEncoding'),
863863
version: new Types.Int(0),
864864
},
865+
// As the image property is not exposed, we don't define constructorArgs.
866+
// The image property is hidden, as it does not have a good corresponding python type (yet)
865867
//constructorArgs: [ 'image', 'mapping', 'wrapS', 'wrapT', 'magFilter', 'minFilter', 'format', 'type', 'anisotropy' ],
866868
propsDefinedByThree: [ 'id', 'uuid', 'version' ],
867869
},

0 commit comments

Comments
 (0)