b78701f6fe
ocean sim
...
- UV's were not being calculated if there were too many VColor layers.
- precalc (omd->size * omd->spatial_size) was being called in a loop.
- use vector functions to avoid pointer indrections on each access which the compiler wont optimize - eg: och->ibufs_disp[f]->rect_float[4*(res_x*j + i) + 1]
- dont call abs() on ints (converts to double and back to int in this case).
also unrelated render buttons change. move saving options directly under the file path since these were easy to confuse with image format options like zbuf, ycc, preview.. etc.
2011-11-22 18:03:33 +00:00
c6391e8d23
svn merge ^/trunk/blender -r42053:42069
2011-11-22 15:33:44 +00:00
36fa74b50e
remove unnecessary switch() statement from ocean sim loop.
2011-11-22 15:10:08 +00:00
f9e00b5c99
svn merge ^/trunk/blender -r42009:42053
2011-11-22 11:51:42 +00:00
fd742566a6
- use cache_ as a prefix for new modifiers.
...
- some comments to recent image changes.
2011-11-22 10:04:28 +00:00
Lukas Toenne
d4f27b7bf0
Yet another fix for crashes when drawing empty base mesh with constructive modifier. This crashed with ocean modifier ( #29241 ). The previous fix was to avoid drawing mapped faces altogether for empty edit mesh, but that also disables the actual derived mesh display ( #29346 ).
...
The real reason for this crash is that ocean modifier (in generative setting) does not properly set the derived mesh face ORIGINDEX data to ORIGINDEX_NONE. With this the previous fixes are not necessary.
2011-11-21 11:46:05 +00:00
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
f1eb66aa68
share code for fluidsim, ocean & dynamic paint file paths.
...
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
2011-11-20 14:38:11 +00:00
Lukas Toenne
17b113c784
Option to rename the vertex color data layer used by Ocean modifier for foam. The modifier outputs foam values to both textures and a (temporary) vertex data layer. This layer was unnamed before, which makes it impossible to access in shader nodes. Now the user can input a custom name in the modifier panel, then use that same name in a shader input node to access foam values.
...
http://www.pasteall.org/pic/21120
2011-11-20 14:16:41 +00:00
9d05ccf9e8
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
2011-11-16 19:06:38 +00:00
Lukas Toenne
391f40e8c9
Default cache file paths for ocean and fluidsim modifiers are now "<temp folder>/ocean_cache/" and "<temp_folder>/fluid_cache/" when the file is not saved yet at the time the modifiers are created.
...
If it has been saved, the file paths are relative to the .blend: "//ocean_cache/" and "//fluid_cache/".
This should at least partially fix bug #29273 . Particle external point caches are not changed.
http://projects.blender.org/tracker/?func=detail&atid=498&aid=29273&group_id=9
2011-11-16 12:43:12 +00:00
c00c0134e0
svn merge -r41847:41899 ^/trunk/blender
2011-11-16 03:10:15 +00:00
502081879b
remove unused OceanModifierData member & use smaller flags where possible
2011-11-15 03:48:25 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
49ccf975f2
minor cleanup
...
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
2011-11-14 16:05:44 +00:00
dfd20bb888
remove double promotions and some formatting edits (tabs & spaces mixed)
2011-11-13 16:10:01 +00:00
2af9b9476e
Make Ocean modifier compile again! Also removed it’s $ID$ heading stuff.
2011-11-13 15:41:40 +00:00
8b32341775
ensure that the path and directory are joined correctly for ocean cache (assumed path ended with a '/')
2011-11-13 15:17:24 +00:00
Lukas Toenne
11c83d8432
Ocean Sim modifier patch
...
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
