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

Multiple Oceans: Connect underwater to ocean instance #829

Merged
merged 3 commits into from
May 14, 2021

Conversation

daleeidd
Copy link
Collaborator

This is to be merged into #650.

I had this in my stash. I tested with two ocean instances and two cameras. Appears to work. I have added test data with two camera setup.

@daleeidd daleeidd requested a review from huwb May 13, 2021 19:07
Copy link
Contributor

@huwb huwb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving this, even though my comments suggest change. Given this is going into a dev branch and will probably be reviewed again i dont mind too much.

Oh and is main.unity changes intentional? I'm fine with them if they are.

Validation already enforces a camera as a parent.
@daleeidd daleeidd force-pushed the feature/multiple-oceans-2 branch from 5828a39 to eca9f89 Compare May 14, 2021 00:02
@daleeidd
Copy link
Collaborator Author

Thanks.

Oh and is main.unity changes intentional? I'm fine with them if they are.

They were as it sets up two cameras for testing. But a have dropped that commit as I have instead duplicated the scene to an git ignored folder for testing instead. This should make merging master into your branch easier.

@daleeidd daleeidd merged commit 55c79f8 into feature/multiple-oceans May 14, 2021
@daleeidd daleeidd deleted the feature/multiple-oceans-2 branch May 14, 2021 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants