search

USC-NSL / Computational-Agroecology

6 stars 1 forks source link

Merge Photonsimulator Partially #72

Closed onethree-13 closed 5 years ago

onethree-13 commented 5 years ago

We are merging photon simulator to master now, for the Thursday reformatting. Althogh it does not meet the standard of google style, it is compilable and runnable. Please test the openGL libarary dependency in /environment/README.md.

fxdawnn commented 5 years ago

It's hard to identify the newly added component. Maybe it's good to make another PR just to delete the old things?

onethree-13 commented 5 years ago

It's hard to identify the newly added component. Maybe it's good to make another PR just to delete the old things?

OK

ralphchung commented 5 years ago

@onethree-13 I just did the clang-format. Please check it if that is OK to you.

onethree-13 commented 5 years ago

@onethree-13 I just did the clang-format. Please check it if that is OK to you.

@tszxxx Please have a look as well.

ralphchung commented 5 years ago

I would only look at the photon_simulator.h and photon_simulator.cc under the environment directory.

barath commented 5 years ago

It looks like this needs to be merged, but only after changes are made?

ralphchung commented 5 years ago

@barath Changes has been made. I was fixing the rebasing issue yesterday. Now I re-ran again. It seems that the latest version is not working. It is working when reverting back to the commit 36c7ec655f4968b15be7eb9a662b699a226343f3. @tszxxx Please take a look at this. I think I did not mess up your code during rebasing. However, some errors may have occurred. I apologize if I wrongly handled this.

tszxxx commented 5 years ago

@barath Changes has been made. I was fixing the rebasing issue yesterday. Now I re-ran again. It seems that the latest version is not working. It is working when reverting back to the commit 36c7ec6. @tszxxx Please take a look at this. I think I did not mess up your code during rebasing. However, some errors may have occurred. I apologize if I wrongly handled this.

OK, I just change it to make it runnable.