Commit Graph

48 Commits

Author SHA1 Message Date
Dalai Felinto
33ee3fc6fe CMake fix for GCC 4.4.1 crash (on ubuntu 9.10 ) reported (on IRC) and fixed by Elia Sarti (vekoon)
(it was broken since rev. 27257.)
2010-03-28 21:38:22 +00:00
Dalai Felinto
790d6ca256 small png include adjustments (ifndef NOPNG ...).
* gameplayer is now probably not going to build without PNG turned ON.

To fix that it would be necessary to use #ifndef NOPNG  around the GPC_Canvas::MakeScreenShot.
Since I don't this function it's working in 2.5 yet it's better to wait for that before doing it.
2010-03-03 19:34:17 +00:00
Dalai Felinto
c5231858d4 fix for CMake compile in windows. ($PNG_INC was needed) - partial revert of commit 27251 2010-03-03 19:18:50 +00:00
Campbell Barton
f09efddcda fix for minor errors/warnings 2010-03-03 13:59:57 +00:00
Campbell Barton
0988f65146 fix for blenderplayer building. 2010-02-13 14:18:54 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Brecht Van Lommel
ec7df03c86 Warning fixes, one actual bug found in sequencer sound wave drawing. Also
changed some malloc to MEM_mallocN while trying to track down a memory leak.
2010-02-08 13:55:31 +00:00
Daniel Genrich
dedbf8608e Smoke: Patch #20955 / fix by Damien Plisson (damien78)
* Smoke got it's own thread loop now and can be esc'ed now
* Apple OpenMP bug workaround until they fix the GCC (couldn't test this one)
* removing some "static" keyword to prevent crashing on frame display
* should also fix problems with wavelet.noise crashing (Bug #20710)

Fluid:
* sleep delay has been reduced to be more responsive
* Fluid progress is displayed in percent using the mouse cursor (like smoke)
2010-02-07 14:25:09 +00:00
Tom Musgrove
f2a8bb3498 this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit 2010-02-01 18:39:41 +00:00
Benoit Bolsee
217c2638cc Update MSVC project files 2010-01-26 16:31:00 +00:00
Daniel Genrich
83dfade37a Smoke: The well known Miika Hämäläinen (aka MiikaH) patch (http://blenderartists.org/forum/showthread.php?t=158317&page=42)
* Better (and windows enabled) OpenMP handling (> 2x-5x speed)
* More Volumetric Texture mapping options (heat, etc) <-- Matt if that's not to your liking, just revert that part, it's separate anyway
* Initial velocity taken from particle settings (no more slow starting)
* Option to select compression method (there seem to be a bug in my high compression usage, at least it's been reported to result in exploding smoke - better use low compression for the time being)

It's been tested since a while but as usual please report any (new!) bugs. ;-)
2010-01-25 15:10:14 +00:00
Guillermo S. Romero
3e2766bc2e Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.
And handful of whitespace clean ups.
2009-11-09 20:08:19 +00:00
Daniel Genrich
14f62c1321 Smoke:
* Enable external forces like e.g. wind
2009-10-08 10:18:14 +00:00
Daniel Genrich
fbb47e8604 Smoke:
* Dissolve is back
* Obstacles coming back (some bugs left i think)
2009-10-02 11:09:05 +00:00
Benoit Bolsee
1483fafd13 Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library. 2009-09-24 21:22:24 +00:00
Kent Mein
22d027dcb2 fixed some indentation, and removed
declaration of index in a couple of places because it was
already defined and safe to use the old def.

Kent
2009-09-24 16:18:17 +00:00
Daniel Genrich
9f5e42ff76 Smoke:
* Totally new try to get cache running
* Didn't try "bake" and such things yet

Hint
* Very verbose yet
* Please do only test new blend files, not old ones!

Please give me feedback on my blog about the old crashers.
2009-09-14 00:01:08 +00:00
Daniel Genrich
8e2d861695 Smoke:
* Enable cache for high res + new preview
* Bugfix for smoke banding (in cooperation with N_T)

Hint: Work-in-progress regarding collision objects so can be broken, didn't test

Hint2: jahka enabled a general particle panel but 
* bake button doesn't work
* step is not supported for cloth
* several other things there ;)
2009-09-09 18:39:40 +00:00
Nathan Letwory
fb649d5824 * cleaning up warnings (mostly windows). A collection of other warning fixes too (undefined function, assuming int, etc.)
This compiled fine with scons/msvc and scons/mingw (gcc 4.4.0). Please test and report any problems.
2009-09-06 13:20:05 +00:00
Campbell Barton
0a3694cd6e white space commit. (2 spaces -> tab).
Was annoying to use a different editor for cmake only.
theeth says this should be ok with gsoc and merges from branches.
2009-09-06 01:51:23 +00:00
Joshua Leung
4893cdc338 2.5 - Warning cleanups (for mingw+scons)
Also, made the Outliner's horizontal scrollbar work better for keymaps view. It's still using an approximation of the width, but at least you can scroll now.
2009-08-26 00:38:43 +00:00
Daniel Genrich
286c2ca80b Smoke:
* cache for low res (deactivating high res for now)
* new way of view3d rendering of smoke (no longer 3 axes) -using 3dtexture now (introduced into gpu/intern)
* introducing LZO and LZMA libs into extern (makefiles missing for now)
* reducing memory usage after simulating for the frame ended (freeing temporary buffers)
* splitting smoke into 2 modifier for the cache-sake (it cannot handle more than 1 cache on the same modifier-index)
* no color on gui anymore
* fixing non-power-of-2 resolutions (hopefully)
* fixing select-deselect of domain drawing bug
* fixing drawobject.c coding style (making Ton happy) ;-)

HINT #1: If scons doesn't work -> cmakefiles are up-to-date, couldn't test scons (but i tried to mantain them, too)

CODERS HINT #1: we really need a way to disable adding all modifiers through "Add Modifiers" dropdown!

WARNING #1: before applying this commit, deactivate your SMOKE DOMAIN in your old files and save them then. You can open them then savely after that.

WARNING #2: File and cache format of smoke can be changed, this is not final!
2009-08-20 00:33:59 +00:00
Brecht Van Lommel
314b14301f 2.5: warning fixes
Directories intern/ and source/blender/ now compile warning
free again here with scons/gcc.
2009-08-15 16:36:25 +00:00
Daniel Genrich
15e617f2a9 Smoke: accidentally left some old code in 2009-08-12 17:39:38 +00:00
Daniel Genrich
fb7c9d5a0d Smoke:
* New feature: "Dissolve Smoke" - Idea by nudelZ
2009-08-12 17:32:02 +00:00
Campbell Barton
cb9e51bf8a missing include for fluid 2009-08-10 14:15:05 +00:00
Daniel Genrich
f1c69e9d84 Smoke:
* bugfix for crash when loading smoke files more once on linux/mac
* could also fix occasional explosions
* code cleanup
2009-08-10 14:09:56 +00:00
Daniel Genrich
b58083ea55 smoke: fix fft not working 2009-08-09 15:04:31 +00:00
Daniel Genrich
5256def6f5 fftw3 scons: hopefully fixing indent error 2009-08-09 11:02:47 +00:00
Daniel Genrich
054ed5a50b Smoke:
* WITH_BF_FFTW3 flag --> fftw3 scons + cmake settings refined. 
* Disabled by default since mac + win32 libs missing. Works already on win64 + linux (with installed fftw3 libs)
2009-08-09 10:55:25 +00:00
Daniel Genrich
d48ca69985 Smoke: decoupling of wavelet #2, new noise strength option on gui, fftw3 option in place for cmake, scons yet uncommited 2009-08-09 01:30:32 +00:00
Daniel Genrich
ce273aee08 smoke:
- Bugfix: a bit too fast ;-) Better do it right too (problem with res > 150)
- fixing high res view button which disappeared sometimes
- fixing tooltip
2009-08-07 13:19:17 +00:00
Daniel Genrich
7c8c83f30d Smoke: test commit of PCG 2009-08-07 01:07:45 +00:00
Daniel Genrich
85c343c049 Smoke: another 10-20% speed gain due to CG (conjugate gradient) improvements 2009-08-06 22:28:55 +00:00
Daniel Genrich
2fd0263602 smoke: decoupling high-res, introducing reset for heat+gravity, fixing another obstacle problem 2009-08-06 16:50:02 +00:00
Daniel Genrich
262a76812e Smoke:
a) fixing domain boundaries
b) fixing flow gui (no more velocity there - taken from particles)
c) Outflow available (deletes smoke from scene)
d) deactivating other noise options for now
e) base for render/preview settings 
f) fixing collisions to be working again
2009-08-02 23:30:44 +00:00
Daniel Genrich
900c61f062 Smoke: fixing 8MB memleak 2009-08-02 15:57:19 +00:00
Benoit Bolsee
b6abeca2fe Update MSVC projects files 2009-08-01 10:13:32 +00:00
Daniel Genrich
da4ab9b14b Smoke:
a) Crash fixed when loading files with smoke
b) changed presets to be more low-cpu friendly
c) smoke looks thicker

Unsolved:
a) 3dview of smoke changes weirdly when looking at front/back. Just move around a cube with smoke and you know what I mean - odd shading. If someone likes to take a look: draw_object.c -> search for "smoke" there
2009-07-30 22:11:28 +00:00
Daniel Genrich
0d45058867 Smoke: compile error due to bad merged conflicts 2009-07-30 20:18:28 +00:00
Daniel Genrich
dbba273371 Smoke: fixing some compile warning reported by Ton and one compile erro for gcc 4.4.1 reported by mrunion 2009-07-30 20:12:40 +00:00
Campbell Barton
1dbd47f4c3 wasnt building with gcc 4.4 2009-07-30 20:11:59 +00:00
Guillermo S. Romero
d3fb4ec0b4 SVN maintenance. 2009-07-30 18:39:22 +00:00
Stefan Gartner
1c6cb51e65 2.5:
first step at adding Makefiles for smoke

NOTE: someone needs to add $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a 
to source/Makefile to make it link
2009-07-30 18:19:46 +00:00
Daniel Genrich
20819ddcc9 Smoke: forgot cmake file 2009-07-30 15:25:56 +00:00
Daniel Genrich
98d45c3da0 smoke: another fftw3 error fixed 2009-07-30 15:07:44 +00:00
Daniel Genrich
accc2ab744 smoke: forgot to disable fftw3 noise function 2009-07-30 15:03:00 +00:00
Daniel Genrich
58c88bcf76 BF2.5: First commit of smoke code.
Not working: 
a) rendering (since volumterics branch is not merged yet)
b) moving collision objects of any kind
c) saving of collision objects (because that's what I am working on)
d) pointcache
e) A bunch of other things I already know of 

So please do not report any bugs on this one yet :-)
2009-07-30 15:00:26 +00:00