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.

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

Update babylon.sceneSerializer.ts #830

Merged
merged 1 commit into from Nov 19, 2015
Merged

Conversation

@dad72
Copy link
Contributor

dad72 commented Nov 18, 2015

added collisionsEnabled and workerCollisions for serialization

David
add collisionsEnabled and workerCollisions
@dad72
Copy link
Contributor Author

dad72 commented Nov 19, 2015

There is a problem with this PR ? Why does it not confirm with others that have been? I make mistakes on one of its two line?
serializationObject.collisionsEnabled = scene.collisionsEnabled;
serializationObject.workerCollisions = scene.workerCollisions;

@Temechon
Copy link
Contributor

Temechon commented Nov 19, 2015

Raanan is the collision master, I think it's up to him to validate your PR. For me it seems ok (only two lines), but maybe there are some edge effects.
Just wait his feedback :)

@RaananW
Copy link
Member

RaananW commented Nov 19, 2015

Hi, sorry, I just waved to wait with it until I finish the scene loader as well. Merging won't matter, as it's not read yet.
I'll merge now and hopefully commit my changes in a few hours

@RaananW
Copy link
Member

RaananW commented Nov 19, 2015

(*just wanted)

RaananW added a commit that referenced this pull request Nov 19, 2015
Update babylon.sceneSerializer.ts
@RaananW RaananW merged commit df33ba7 into BabylonJS:master Nov 19, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@dad72
Copy link
Contributor Author

dad72 commented Nov 19, 2015

Ok.

@deltakosh
Copy link
Contributor

deltakosh commented Nov 19, 2015

And please do not forget to update this as well: http://doc.babylonjs.com/generals/File_Format_Map_(.babylon)

@RaananW
Copy link
Member

RaananW commented Nov 19, 2015

working on it now, I just added a few more properties.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.