Skip to content
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.

Sign up for GitHub

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

Jump to bottom

NodeLoader: Deserialize sub-properties and fixes. #25590

Merged
merged 4 commits into from
Mar 1, 2023
Merged

NodeLoader: Deserialize sub-properties and fixes. #25590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0965854
Node: Deserialize sub-properties.
sunag Mar 1, 2023
865c9d5
NodeLoader: Fix get json.type.
sunag Mar 1, 2023
6751b30
Node: New inputObject to deserialize().
sunag Mar 1, 2023
7d23558
ConvertNode: Fix serialize .convertTo property.
sunag Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/jsm/nodes/core/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,20 @@ class Node {

this[ property ] = inputArray;

} else if ( typeof json.inputNodes[ property ] === 'object' ) {

const inputObject = {};

for ( const subProperty in json.inputNodes[ property ] ) {

const uuid = json.inputNodes[ property ][ subProperty ];

inputObject[ subProperty ] = nodes[ uuid ];

}

this[ property ] = inputObject;

} else {

const uuid = json.inputNodes[ property ];
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/nodes/loaders/NodeLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class NodeLoader extends Loader {

parse( json ) {

const node = nodeObject( createNodeFromType( type ) );
const node = nodeObject( createNodeFromType( json.type ) );
node.uuid = json.uuid;

const nodes = this.parseNodes( json.nodes );
Expand Down
16 changes: 16 additions & 0 deletions examples/jsm/nodes/utils/ConvertNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,22 @@ class ConvertNode extends Node {

}

serialize( data ) {

super.serialize( data );

data.convertTo = this.convertTo;

}

deserialize( data ) {

super.deserialize( data );

this.convertTo = data.convertTo;

}

generate( builder, output ) {

const node = this.node;
Expand Down