[GSoC 2012] Volume Rendering with LOD aimed at terrain

[duststorm]

Maybe you could use the transplant plugin. That would allow you to pick the commits that don't include the textures and diff them on top of the latest head of ogre.

[CABAListic]

We definitely don't want to increase the repository size by that amount! That would be like a 100%-200% increase, not worth it. If you can use transplant, great, but Assaf has also forsaken history of the DX11 project for the same reason, so we can live with that.

[PhilipLB]

Ok, given that the project is quite separated, the "manual transplant" will be easy:
- Add the Volume folder in the components
- Add the Sample Volume Terrain
- Add some media files
- Update a few cmake files
- Done
-> will be done at the latest tomorrow

[Mattan Furst]

Btw

Just out of curiosity, How did you notice that the source control expanded that much? is it something you normally check or was it a fluke?

(I don't think I would have though of checking such a thing up till now)

[Mattan Furst]

Hi Philip,

As you discussed earlier please make the merge using a secondary fork. When done, before merging to the Ogre Trunk please note this in the forum and wait for a confirmation. Assaf has been having problems with the merges he is doing with his directX 11 GSoC project, And he wants to ensure they don't occur with your project.

If this complicates things for you I can still do the merge instead

[PhilipLB]

Hi,

ok, will do.
How I noticed: You find those numbers displayed at https://bitbucket.org/philiplb/ogrevolumeterrain/ and https://bitbucket.org/sinbad/ogre . So basically a fluke.

[Mattan Furst]

great catch

[PhilipLB]

Tweaking and release preparing.

• Worked again on the texturing of the skirts. They are much better looking now for an acceptable cost of a tiny bit more loading time.
• Added the copyright headers to all files and some minor style cleanup.
• Fixed the never-before-tested CSGCubeSource.
• Some tweaks and cleanup of the sample VolumeTerrain.
• Added a CSG sample. The parameters had to be tweaked a bit so there are no holes. This CSG surely isn't made for modelling...

[youtube]eseI2LmXBx0[/youtube]

[Mind Calamity]

That's very, very good! I'm glad you finished it Great job!

[PhilipLB]

The clean fork with the project being added to it is ready for merging:
https://bitbucket.org/philiplb/ogrevolumeterrain2/

[drwbns]

Is this going to be able to easily combime with the new terrain paging improvements?

[PhilipLB]

Without knowing the paging component, I think I can already say: No, this is too different to the terrain paging improvements.

[Mattan Furst]

Hi philipLB,

I looked over at your new merge fork. It's a good clean job.
I'm just waiting for final confirmation from Assaf Raman (just in case). I already PM'ed him.

[PhilipLB]

Cool.

After the merge, how do you imagine the user documentation? A new chapter in the manual? Some wiki articles (prefered by me)? More API documentation (Doxygen)?

[Alexiss]

Wiki is the most user friendly imho

[Mattan Furst]

agreed.

For pure API documentation Ogre prefers doxygen. Anything on a higher level such as how to user guides should be in Ogre Wiki articles.

[Assaf Raman]

Hi philipLB,

I looked over at your new merge fork. It's a good clean job.
I'm just waiting for final confirmation from Assaf Raman (just in case). I already PM'ed him.

I committed the d3d11 code to the trunk, I am not an issue anymore, feel free to commit (as long as it is a good clean commit without the junk...)

[Assaf Raman]

Also remember - https://twitter.com/wolfmanfx/status/237891326149029888

@AssafRaman i think mattan asked that in the forum and afaik the gsoc project should be merged into 1.9...

[Mattan Furst]

@PhilipLB

Just submitted the final GSoC evaluation.

@Assaf

As I've stated before this is a response I got from CABAListic about committing changes

By default, we merge upwards, that means that commits should be done in the lowest applicable branch. Bugfixes go to v1-8, (relatively) stable features to the next major version, i.e. v1-9. Due to our roadmap that exceptionally encompasses two major version, we also have v2-0 for anything targeted at that. default is only to be used for unstable changes (although these may be better to do in a separate repository and merged when somewhat stable).

This GSoC project is a new but stable feature so it should go in v1-9 than merged upwards.

you can view the entire communication in the private forum under http://www.ogre3d.org/forums/viewtopic.php?f=7&t=71367

[PhilipLB]

Evaluation: Thx, yours is submitted, too.

[Assaf Raman]

Well, we can merge from the trunk to 1.9

[Mattan Furst]

@Philip
I just spoke to Assaf he meant merge 1.9 to the trunk not trunk to 1.9.

[PhilipLB]

So I'll do the fork again and merge this time into default. NP, will be done tonight/tomorrow evening.

[CABAListic]

No, wait. If you have everything in 1-9, that's exactly where it's meant to be. From there, we can then simply merge it upwards. No reason doing it separately for default.

[PhilipLB]

Ok.
As posted above, everything got manually merged in a new fork into the 1.9 branch there: https://bitbucket.org/philiplb/ogrevolumeterrain2/