Conversation
|
I have some files relating to Camera in my branch. This PR will have to wait for a bit, sorry! |
|
That's alright! Should I close this PR then? |
No, keep it open. Once the camera files are committed into the master branch, you can fix any merge conflicts that arise from it. |
|
Can you resolve the merge conflicts? |
|
Hang on |
I moved G3D. I was having compiler errors when having it in between Instance and Extents.
|
Fixed the merge conflict involving with the header. |
|
I got a question. Do I need to do every single function instead of doing some of it? |
|
I'm going to be honest, this is the best I can do with this. I'm already at my limit. I'm just unable to do all of it. |
i think you should be able to merge without everything. Progress is still progress |
|
I hope so! |
|
I feel like this needs another review since I added more code. I honestly don't want to add more code into this. |
This has almost all the functions except for,
setImageServerViewNoLerp, characterZoom, getNewZoomDistance