Skip to content

Core: Increase version of Object/Scene format. #31096

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

Merged
merged 2 commits into from
May 16, 2025
Merged

Core: Increase version of Object/Scene format. #31096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
383902f
Increment version in Material.toJSON
repalash May 13, 2025
34dee38
Increment json metadata version in core
repalash May 16, 2025
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
2 changes: 1 addition & 1 deletion src/core/BufferGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ class BufferGeometry extends EventDispatcher {

const data = {
metadata: {
version: 4.6,
version: 4.7,
type: 'BufferGeometry',
generator: 'BufferGeometry.toJSON'
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/Object3D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ class Object3D extends EventDispatcher {
};

output.metadata = {
version: 4.6,
version: 4.7,
type: 'Object',
generator: 'Object3D.toJSON'
};
Expand Down
2 changes: 1 addition & 1 deletion src/extras/core/Curve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ class Curve {

const data = {
metadata: {
version: 4.6,
version: 4.7,
type: 'Curve',
generator: 'Curve.toJSON'
}
Expand Down
2 changes: 1 addition & 1 deletion src/materials/Material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ class Material extends EventDispatcher {

const data = {
metadata: {
version: 4.6,
version: 4.7,
type: 'Material',
generator: 'Material.toJSON'
}
Expand Down
2 changes: 1 addition & 1 deletion src/nodes/core/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ class Node extends EventDispatcher {
type,
meta,
metadata: {
version: 4.6,
version: 4.7,
type: 'Node',
generator: 'Node.toJSON'
}
Expand Down
2 changes: 1 addition & 1 deletion src/objects/Skeleton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class Skeleton {

const data = {
metadata: {
version: 4.6,
version: 4.7,
type: 'Skeleton',
generator: 'Skeleton.toJSON'
},
Expand Down
2 changes: 1 addition & 1 deletion src/textures/Texture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ class Texture extends EventDispatcher {
const output = {

metadata: {
version: 4.6,
version: 4.7,
type: 'Texture',
generator: 'Texture.toJSON'
},
Expand Down
2 changes: 1 addition & 1 deletion test/unit/src/core/BufferGeometry.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ export default QUnit.module( 'Core', () => {
let j = a.toJSON();
const gold = {
'metadata': {
'version': 4.6,
'version': 4.7,
'type': 'BufferGeometry',
'generator': 'BufferGeometry.toJSON'
},
Expand Down
2 changes: 1 addition & 1 deletion test/unit/src/core/Object3D.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ export default QUnit.module( 'Core', () => {

const gold = {
'metadata': {
'version': 4.6,
'version': 4.7,
'type': 'Object',
'generator': 'Object3D.toJSON'
},
Expand Down
4 changes: 2 additions & 2 deletions test/unit/utils/qunit-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function getDifferingProp( geometryA, geometryB ) {
// Compare json file with its source geometry.
function checkGeometryJsonWriting( geom, json ) {

QUnit.assert.equal( json.metadata.version, '4.6', 'check metadata version' );
QUnit.assert.equal( json.metadata.version, '4.7', 'check metadata version' );
QUnit.assert.equalKey( geom, json, 'type' );
QUnit.assert.equalKey( geom, json, 'uuid' );
QUnit.assert.equal( json.id, undefined, 'should not persist id' );
Expand Down Expand Up @@ -270,7 +270,7 @@ function checkLightCopyClone( assert, light ) {
// Compare json file with its source Light.
function checkLightJsonWriting( assert, light, json ) {

assert.equal( json.metadata.version, '4.6', 'check metadata version' );
assert.equal( json.metadata.version, '4.7', 'check metadata version' );

const object = json.object;
assert.equalKey( light, object, 'type' );
Expand Down