[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_effect.h blender/source/blender/blenkernel/intern effect.c ipo.c object.c blender/source/blender/blenloader/intern readfile.c writefile.c blender/source/blender/include BIF_butspace.h BIF_resources.h BSE_editipo_types.h butspace.h ...
Ton Roosendaal
ton at blender.org
Sat Jun 26 20:18:13 CEST 2004
ton (Ton Roosendaal) 2004/06/26 20:18:13 CEST
Modified files:
blender/source/blender/blenkernel BKE_effect.h
blender/source/blender/blenkernel/intern effect.c ipo.c
object.c
blender/source/blender/blenloader/intern readfile.c
writefile.c
blender/source/blender/include BIF_butspace.h BIF_resources.h
BSE_editipo_types.h butspace.h
ipo.h mydevice.h
blender/source/blender/makesdna DNA_ipo_types.h
DNA_mesh_types.h
DNA_object_types.h
blender/source/blender/render/intern/source zbuf.c
blender/source/blender/src blenderbuttons.c butspace.c
buttons_editing.c buttons_object.c
drawview.c editipo.c glutil.c
header_buttonswin.c
Log:
The revised patch from Leon for new particle effects.
New is that objects can have a force field, and Meshes can even deflect
(collide) particles. This is in a new sub-menu in Object buttons F7
The full instructions where on the web, Leon mailed it me and I will put
it in CMS tomorrow. For those who like to play with it now, here are demo
files:
http://download.blender.org/demo/test/
Quite some changes where in the integration though... so previous created
particle deflectors will not work. Changes to mention now are:
- gravity is renamed to 'force field'
- force field and deflector options are in Object now, not in Mesh
- the options also have its own struct, doesnt add to Object by default
- force fields are possible for all object types, but only work on center.
So empty objects are typical for it.
Work to do:
- add draw method in 3d win to denote forcefield objects
- check on the UI (panel with different size?)
- add 'recalc' button in deflector panel
Revision Changes Path
1.7 +2 -2 blender/source/blender/blenkernel/BKE_effect.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_effect.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.12 +509 -35 blender/source/blender/blenkernel/intern/effect.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/effect.c.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
1.6 +37 -21 blender/source/blender/blenkernel/intern/ipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/ipo.c.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
1.18 +5 -1 blender/source/blender/blenkernel/intern/object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/object.c.diff?r1=1.17&r2=1.18&cvsroot=bf-blender>
1.60 +2 -2 blender/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/readfile.c.diff?r1=1.59&r2=1.60&cvsroot=bf-blender>
1.22 +3 -1 blender/source/blender/blenloader/intern/writefile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenloader/intern/writefile.c.diff?r1=1.21&r2=1.22&cvsroot=bf-blender>
1.4 +5 -1 blender/source/blender/include/BIF_butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_butspace.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
1.22 +6 -4 blender/source/blender/include/BIF_resources.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_resources.h.diff?r1=1.21&r2=1.22&cvsroot=bf-blender>
1.7 +7 -2 blender/source/blender/include/BSE_editipo_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BSE_editipo_types.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.22 +18 -17 blender/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/butspace.h.diff?r1=1.21&r2=1.22&cvsroot=bf-blender>
1.7 +7 -2 blender/source/blender/include/ipo.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/ipo.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.12 +2 -1 blender/source/blender/include/mydevice.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/mydevice.h.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
1.7 +8 -2 blender/source/blender/makesdna/DNA_ipo_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_ipo_types.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.18 +4 -4 blender/source/blender/makesdna/DNA_mesh_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_mesh_types.h.diff?r1=1.17&r2=1.18&cvsroot=bf-blender>
1.14 +15 -1 blender/source/blender/makesdna/DNA_object_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_object_types.h.diff?r1=1.13&r2=1.14&cvsroot=bf-blender>
1.12 +5 -3 blender/source/blender/render/intern/source/zbuf.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/zbuf.c.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
1.11 +1366 -1327blender/source/blender/src/blenderbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/blenderbuttons.c.diff?r1=1.10&r2=1.11&cvsroot=bf-blender>
1.28 +13 -5 blender/source/blender/src/butspace.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/butspace.c.diff?r1=1.27&r2=1.28&cvsroot=bf-blender>
1.51 +2 -2 blender/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_editing.c.diff?r1=1.50&r2=1.51&cvsroot=bf-blender>
1.30 +176 -97 blender/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_object.c.diff?r1=1.29&r2=1.30&cvsroot=bf-blender>
1.70 +2 -2 blender/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawview.c.diff?r1=1.69&r2=1.70&cvsroot=bf-blender>
1.27 +47 -5 blender/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editipo.c.diff?r1=1.26&r2=1.27&cvsroot=bf-blender>
1.7 +4 -1 blender/source/blender/src/glutil.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/glutil.c.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
1.24 +8 -5 blender/source/blender/src/header_buttonswin.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_buttonswin.c.diff?r1=1.23&r2=1.24&cvsroot=bf-blender>
More information about the Bf-blender-cvs
mailing list