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

Jamet merging sampler #1

Merged
merged 3 commits into from
Jun 4, 2015
Merged

Jamet merging sampler #1

merged 3 commits into from
Jun 4, 2015

Conversation

jamet
Copy link
Contributor

@jamet jamet commented Jun 3, 2015

hi gilad, i tested on my new laptop, seems good for me a nd ready to be merged.

changes are; cameras vetor is now a vector of camera pointer to adress a cam object but also cam sampler object.

i also never managed to get brickwall shader to work, i m not sure if i messed up the code somewhere or if it was not working at first. could you try to clone this and see if it works ok for you.

if it does we could merge this branch into master

Giladx added a commit that referenced this pull request Jun 4, 2015
@Giladx Giladx merged commit 7a999d3 into master Jun 4, 2015
@jamet jamet deleted the jametMergingSampler branch June 5, 2015 10:25
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