[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16841] trunk/blender/source/blender: Fix for bug #17302: subsurf + particle size vertex groups did not
Revision: 16841 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16841 Author: blendix Date: 2008-09-30 08:12:47 +0200 (Tue, 30 Sep 2008) Log Message: --- Fix for bug #17302: subsurf + particle size vertex groups did not work correct, also refactored some code here to make it more clear. Modified Paths: -- trunk/blender/source/blender/blenkernel/BKE_particle.h trunk/blender/source/blender/blenkernel/intern/modifier.c trunk/blender/source/blender/blenkernel/intern/particle.c trunk/blender/source/blender/blenkernel/intern/particle_system.c trunk/blender/source/blender/render/intern/source/convertblender.c trunk/blender/source/blender/src/editparticle.c Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h === --- trunk/blender/source/blender/blenkernel/BKE_particle.h 2008-09-30 05:51:51 UTC (rev 16840) +++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2008-09-30 06:12:47 UTC (rev 16841) @@ -226,7 +226,7 @@ void copy_particle_key(struct ParticleKey *to, struct ParticleKey *from, int time); -void psys_particle_on_emitter(struct Object *ob, struct ParticleSystemModifierData *psmd, int distr, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor); +void psys_particle_on_emitter(struct ParticleSystemModifierData *psmd, int distr, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor); struct ParticleSystemModifierData *psys_get_modifier(struct Object *ob, struct ParticleSystem *psys); struct ParticleSettings *psys_new_settings(char *name, struct Main *main); @@ -284,11 +284,12 @@ float *psys_cache_vgroup(struct DerivedMesh *dm, struct ParticleSystem *psys, int vgroup); void psys_get_texture(struct Object *ob, struct Material *ma, struct ParticleSystemModifierData *psmd, struct ParticleSystem *psys, struct ParticleData *pa, struct ParticleTexture *ptex, int event); void psys_interpolate_face(struct MVert *mvert, struct MFace *mface, struct MTFace *tface, float (*orcodata)[3], float *uv, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor); +float psys_particle_value_from_verts(struct DerivedMesh *dm, short from, struct ParticleData *pa, float *values); float psys_interpolate_value_from_verts(struct DerivedMesh *dm, short from, int index, float *fw, float *values); void psys_get_from_key(struct ParticleKey *key, float *loc, float *vel, float *rot, float *time); int psys_intersect_dm(struct Object *ob, struct DerivedMesh *dm, float *vert_cos, float *co1, float* co2, float *min_d, int *min_face, float *min_uv, float *face_minmax, float *pa_minmax, float radius, float *ipoint); -void psys_particle_on_dm(struct Object *ob, struct DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor); +void psys_particle_on_dm(struct DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor); /* particle_system.c */ void initialize_particle(struct ParticleData *pa, int p, struct Object *ob, struct ParticleSystem *psys, struct ParticleSystemModifierData *psmd); Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c === --- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-09-30 05:51:51 UTC (rev 16840) +++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-09-30 06:12:47 UTC (rev 16841) @@ -6543,7 +6543,7 @@ /* make tree of emitter locations */ tree=BLI_kdtree_new(totpart); for(p=0,pa=psys->particles; pdm,psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,0,0,0,0,0); + psys_particle_on_dm(psmd->dm,psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,0,0,0,0,0); BLI_kdtree_insert(tree, p, co, NULL); } BLI_kdtree_balance(tree); @@ -7146,7 +7146,7 @@ pa= pars+i; /* get particle state */ - psys_particle_on_emitter(ob, psmd,part->from,pa->num,-1,pa->fuv,pa->foffset,loc0,nor,0,0,0,0); + psys_particle_on_emitter(psmd,part->from,pa->num,-1,pa->fuv,pa->foffset,loc0,nor,0,0,0,0); Mat4MulVecfl(ob->obmat,loc0); state.time=cfra; Modified: trunk/blender/source/blender/blenkernel/intern/particle.c === --- trunk/blender/source/blender/blenkernel/intern/particle.c 2008-09-30 05:51:51 UTC (rev 16840) +++ trunk/blender/source/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16840] branches/nurbs/blender: Fix for resolution with 2D curves.
Revision: 16840
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16840
Author: eman
Date: 2008-09-30 07:51:51 +0200 (Tue, 30 Sep 2008)
Log Message:
---
Fix for resolution with 2D curves.
Removed two unneccessary calls.
Modified Paths:
--
branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.cpp
branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp
branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
Modified: branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.cpp
===
--- branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.cpp
2008-09-30 05:05:50 UTC (rev 16839)
+++ branches/nurbs/blender/intern/nurbana/intern/NURBS_Generate.cpp
2008-09-30 05:51:51 UTC (rev 16840)
@@ -2,7 +2,7 @@
//NurbData NURBS_Generate::nurbData;
void NURBS_Generate::Curve(Object_NURBS *obj, nbReal* buffer, int dim, int
res, bool update) {
- Surface(obj, res * obj-> Length(0) , 1 , dim, buffer, obj -> Sum(), 0,
0, update);
+ Surface(obj, res, 1 , dim, buffer, obj -> Sum(), 0, 0, update);
}
void NURBS_Generate::Surface(Object_NURBS *obj, nbReal* buffer, int resU, int
resV, int dim) {
Modified: branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp
===
--- branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp 2008-09-30
05:05:50 UTC (rev 16839)
+++ branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp 2008-09-30
05:51:51 UTC (rev 16840)
@@ -51,7 +51,7 @@
//int numKnotsU,numKnotsV,totalLenU,totalLenV;
// cout << "addObject()" << endl;
- NRB_Print(on);
+// NRB_Print(on);
// cout << "addObject<>" << endl;
return on;
}
Modified: branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
===
--- branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
2008-09-30 05:05:50 UTC (rev 16839)
+++ branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
2008-09-30 05:51:51 UTC (rev 16840)
@@ -818,7 +818,7 @@
if(resolu==0) {
}
-numTess = nu->pntsu * NRB_getNumTessPoints(nu->nurbanaPtr);// FIXME check that
this number is correct
+//numTess = nu->pntsu * NRB_getNumTessPoints(nu->nurbanaPtr);// FIXME check
that this number is correct
//tsspts = NRB_GenerateSurface(nu->nurbanaPtr,data, dim);
tsspts = NRB_GenerateCurve(nu->nurbanaPtr,coord_array, 3, resolu);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16839] trunk/blender/source: WITH_ELBEEM diabled wasnt working with cmake
Revision: 16839
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16839
Author: campbellbarton
Date: 2008-09-30 07:05:50 +0200 (Tue, 30 Sep 2008)
Log Message:
---
WITH_ELBEEM diabled wasnt working with cmake
Modified Paths:
--
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/src/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2008-09-30
04:17:39 UTC (rev 16838)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2008-09-30
05:05:50 UTC (rev 16839)
@@ -73,3 +73,6 @@
ADD_DEFINITIONS(-DWITH_FREETYPE2)
ENDIF(WITH_INTERNATIONAL)
+IF(NOT WITH_ELBEEM)
+ ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
Modified: trunk/blender/source/blender/src/CMakeLists.txt
===
--- trunk/blender/source/blender/src/CMakeLists.txt 2008-09-30 04:17:39 UTC
(rev 16838)
+++ trunk/blender/source/blender/src/CMakeLists.txt 2008-09-30 05:05:50 UTC
(rev 16839)
@@ -80,3 +80,6 @@
ADD_DEPENDENCIES(src mkprot verse)
ENDIF(WITH_VERSE)
+IF(NOT WITH_ELBEEM)
+ ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
Modified: trunk/blender/source/creator/CMakeLists.txt
===
--- trunk/blender/source/creator/CMakeLists.txt 2008-09-30 04:17:39 UTC (rev
16838)
+++ trunk/blender/source/creator/CMakeLists.txt 2008-09-30 05:05:50 UTC (rev
16839)
@@ -187,8 +187,12 @@
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python
blender_render blender_radiosity bf_elbeem)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python
blender_render blender_radiosity)
+IF(WITH_ELBEEM)
+ SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+ENDIF(WITH_ELBEEM)
+
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16838] branches/soc-2008-mxcurioni/ release/scripts: soc-2008-mxcurioni: sending files in release/scripts/ freestyle folder
Revision: 16838 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16838 Author: mxcurioni Date: 2008-09-30 06:17:39 +0200 (Tue, 30 Sep 2008) Log Message: --- soc-2008-mxcurioni: sending files in release/scripts/freestyle folder Added Paths: --- branches/soc-2008-mxcurioni/release/scripts/freestyle/ branches/soc-2008-mxcurioni/release/scripts/freestyle/data/ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ Copied: branches/soc-2008-mxcurioni/release/scripts/freestyle/data (from rev 16793, branches/soc-2008-mxcurioni/source/blender/freestyle/data) Copied: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules (from rev 16793, branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16837] trunk/blender/source/blender/ blenlib/intern/util.c: modify BLI_convertstringcode so windows paths are converted from C:\foo. jpg to /c/foo.jp
Revision: 16837
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16837
Author: campbellbarton
Date: 2008-09-30 06:08:00 +0200 (Tue, 30 Sep 2008)
Log Message:
---
modify BLI_convertstringcode so windows paths are converted from C:\foo.jpg to
/c/foo.jpg
since there is C:\ prefix cant exist on a unix system this wont break any files.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/util.c
Modified: trunk/blender/source/blender/blenlib/intern/util.c
===
--- trunk/blender/source/blender/blenlib/intern/util.c 2008-09-29 23:46:01 UTC
(rev 16836)
+++ trunk/blender/source/blender/blenlib/intern/util.c 2008-09-30 04:08:00 UTC
(rev 16837)
@@ -1149,15 +1149,13 @@
int BLI_convertstringcode(char *path, const char *basepath)
{
- int wasrelative;
+ int wasrelative = (strncmp(path, "//", 2)==0);
char tmp[FILE_MAX];
char base[FILE_MAX];
+#ifdef WIN32
char vol[3] = {'\0', '\0', '\0'};
BLI_strncpy(vol, path, 3);
- wasrelative= (vol[0]=='/' && vol[1]=='/');
-
-#ifdef WIN32
/* we are checking here if we have an absolute path that is not in the
current
blend file as a lib main - we are basically checking for the case
that a
UNIX root '/' is passed.
@@ -1176,6 +1174,20 @@
}
#else
BLI_strncpy(tmp, path, FILE_MAX);
+
+ /* Check for loading a windows path on a posix system
+* in this case, there is no use in trying C:/ since it
+* will never exist on a unix os.
+*
+* Add a / prefix and lowercase the driveletter, remove the :
+* C:\foo.JPG -> /c/foo.JPG */
+
+ if (tmp[1] == ':' && isalpha(tmp[0]) && (tmp[2]=='\\' || tmp[2]=='/') )
{
+ tmp[1] = tolower(tmp[0]); /* replace ':' with driveletter */
+ tmp[0] = '/';
+ /* '\' the slash will be converted later */
+ }
+
#endif
BLI_strncpy(base, basepath, FILE_MAX);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16836] trunk/blender/source/blender: * free bullet-softbody was using free softbody function.
Revision: 16836
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16836
Author: campbellbarton
Date: 2008-09-30 01:46:01 +0200 (Tue, 30 Sep 2008)
Log Message:
---
* free bullet-softbody was using free softbody function.
* mistake from own changes to curves, new curves were being added with too low
resolution.
* removed warnings I added recently
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/src/drawtext.c
trunk/blender/source/blender/src/editcurve.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
23:33:27 UTC (rev 16835)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
23:46:01 UTC (rev 16836)
@@ -70,6 +70,7 @@
#include "BKE_armature.h"
#include "BKE_action.h"
+#include "BKE_bullet.h"
#include "BKE_colortools.h"
#include "BKE_deform.h"
#include "BKE_DerivedMesh.h"
@@ -182,7 +183,7 @@
void object_free_bulletsoftbody(Object *ob)
{
if(ob->bsoft) {
- sbFree(ob->bsoft);
+ bsbFree(ob->bsoft);
ob->bsoft= NULL;
}
}
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.c
===
--- trunk/blender/source/blender/python/api2_2x/Geometry.c 2008-09-29
23:33:27 UTC (rev 16835)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.c 2008-09-29
23:46:01 UTC (rev 16836)
@@ -413,7 +413,7 @@
static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
{
- boxPack *boxarray;
+ boxPack *boxarray = NULL;
float tot_width, tot_height;
int len;
int error;
Modified: trunk/blender/source/blender/src/drawtext.c
===
--- trunk/blender/source/blender/src/drawtext.c 2008-09-29 23:33:27 UTC (rev
16835)
+++ trunk/blender/source/blender/src/drawtext.c 2008-09-29 23:46:01 UTC (rev
16836)
@@ -77,7 +77,8 @@
#include "mydevice.h"
#include "blendef.h"
#include "winlay.h"
-
+#include "PIL_time.h"
+#include /* ispunct */
#include
/***/ /*
Modified: trunk/blender/source/blender/src/editcurve.c
===
--- trunk/blender/source/blender/src/editcurve.c2008-09-29 23:33:27 UTC
(rev 16835)
+++ trunk/blender/source/blender/src/editcurve.c2008-09-29 23:46:01 UTC
(rev 16836)
@@ -4111,7 +4111,7 @@
Mat3One(imat);
cent[0]= cent[1]= cent[2]= 0.0;
}
-
+
if ELEM5(stype, 0, 1, 2, 4, 6) {
nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim");
nu->type= type;
@@ -4121,6 +4121,7 @@
switch(stype) {
case 0: /* curve */
+ nu->resolu= 12; /* set as 4 above */
if(newname) {
rename_id((ID *)G.obedit, "Curve");
rename_id((ID *)G.obedit->data, "Curve");
@@ -4228,6 +4229,7 @@
break;
case 1: /* circle */
+ nu->resolu= 12; /* set as 4 above */
if(newname) {
rename_id((ID *)G.obedit, "CurveCircle");
rename_id((ID *)G.obedit->data, "CurveCircle");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16835] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for part of bug #17521: incorrect uv coordinates for particle
Revision: 16835
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16835
Author: blendix
Date: 2008-09-30 01:33:27 +0200 (Tue, 30 Sep 2008)
Log Message:
---
Fix for part of bug #17521: incorrect uv coordinates for particle
density controlled by a texture.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/particle.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2008-09-29
22:31:47 UTC (rev 16834)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2008-09-29
23:33:27 UTC (rev 16835)
@@ -3191,6 +3191,47 @@
//
/* Textures
*/
//
+
+static int get_particle_uv(DerivedMesh *dm, ParticleData *pa, int face_index,
float *fuv, char *name, float *texco)
+{
+ MFace *mf;
+ MTFace *tf;
+ int i;
+
+ tf= CustomData_get_layer_named(&dm->faceData, CD_MTFACE, name);
+
+ if(tf == NULL)
+ tf= CustomData_get_layer(&dm->faceData, CD_MTFACE);
+
+ if(tf == NULL)
+ return 0;
+
+ if(pa) {
+ i= (pa->num_dmcache==DMCACHE_NOTFOUND)? pa->num:
pa->num_dmcache;
+ if(i >= dm->getNumFaces(dm))
+ i = -1;
+ }
+ else
+ i= face_index;
+
+ if (i==-1) {
+ texco[0]= 0.0f;
+ texco[1]= 0.0f;
+ texco[2]= 0.0f;
+ }
+ else {
+ mf= dm->getFaceData(dm, i, CD_MFACE);
+
+ psys_interpolate_uvs(&tf[i], mf->v4, fuv, texco);
+
+ texco[0]= texco[0]*2.0f - 1.0f;
+ texco[1]= texco[1]*2.0f - 1.0f;
+ texco[2]= 0.0f;
+ }
+
+ return 1;
+}
+
static void get_cpa_texture(DerivedMesh *dm, Material *ma, int face_index,
float *fw, float *orco, ParticleTexture *ptex, int event)
{
MTex *mtex;
@@ -3205,27 +3246,13 @@
short blend=mtex->blendtype;
short neg=mtex->pmaptoneg;
- if(mtex->texco & TEXCO_UV && fw){
- int
uv_index=CustomData_get_named_layer_index(&dm->faceData,CD_MTFACE,mtex->uvname);
- if(uv_index<0){
-
uv_index=CustomData_get_active_layer_index(&dm->faceData,CD_MTFACE);
- }
- if(uv_index>=0){
- CustomDataLayer
*layer=&dm->faceData.layers[uv_index];
- MTFace *mtface=
&((MTFace*)layer->data)[face_index];
- MFace
*mf=dm->getFaceData(dm,face_index,CD_MFACE);
-
psys_interpolate_uvs(mtface,mf->v4,fw,texco);
- texco[0]*=2.0;
- texco[1]*=2.0;
- texco[0]-=1.0;
- texco[1]-=1.0;
- }
- else
+ if((mtex->texco & TEXCO_UV) && fw) {
+ if(!get_particle_uv(dm, NULL, face_index, fw,
mtex->uvname, texco))
VECCOPY(texco,orco);
}
- else{
+ else
VECCOPY(texco,orco);
- }
+
externtex(mtex, texco, &value, rgba, rgba+1, rgba+2,
rgba+3);
if((event & mtex->pmapto) & MAP_PA_TIME){
if((setvars&MAP_PA_TIME)==0){
@@ -3265,33 +3292,16 @@
short blend=mtex->blendtype;
short neg=mtex->pmaptoneg;
- if(mtex->texco & TEXCO_UV){
- int
uv_index=CustomData_get_named_layer_index(&psmd->dm->faceData,CD_MTFACE,mtex->uvname);
- if(uv_index<0){
-
uv_index=CustomData_get_active_layer_index(&psmd->dm->faceData,CD_MTFACE);
+ if((mtex->texco & TEXCO_UV) && ELEM(psys->part->from,
PART_FROM_FACE, PART_FROM_VOLUME)) {
+ if(!get_particle_uv(psmd->dm, pa, 0, pa->fuv,
mtex->uvname, texco)) {
+ /* failed to get uv's, let's try orco's
*/
+
psys_particle_on_emitter(ob,psmd,psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,co,0,0,0,texco,
0);
}
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16834] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix for bug #17713: touch/ no override for rendering was broken.
Revision: 16834
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16834
Author: blendix
Date: 2008-09-30 00:31:47 +0200 (Tue, 30 Sep 2008)
Log Message:
---
Fix for bug #17713: touch/no override for rendering was broken.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-09-29 22:07:13 UTC (rev 16833)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-09-29 22:31:47 UTC (rev 16834)
@@ -2613,6 +2613,8 @@
scene_update_for_newframe(scene, lay);
continue;
}
+ else
+ nfra+= tfra;
if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
BKE_makepicstring(name, scene->r.pic,
scene->r.cfra, scene->r.imtype);
@@ -2643,7 +2645,6 @@
break;
}
- nfra+= tfra;
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16833] trunk/blender/source/blender/src/ buttons_object.c: Fix for bug #17712: fluid button activation crash.
Revision: 16833 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16833 Author: blendix Date: 2008-09-30 00:07:13 +0200 (Tue, 30 Sep 2008) Log Message: --- Fix for bug #17712: fluid button activation crash. Modified Paths: -- trunk/blender/source/blender/src/buttons_object.c Modified: trunk/blender/source/blender/src/buttons_object.c === --- trunk/blender/source/blender/src/buttons_object.c 2008-09-29 20:21:46 UTC (rev 16832) +++ trunk/blender/source/blender/src/buttons_object.c 2008-09-29 22:07:13 UTC (rev 16833) @@ -5017,7 +5017,8 @@ const int separateHeight = 2; const int objHeight = 20; FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim); - int libdata = 0, val = 0; + int libdata = 0; + static int val = 0; uiBut *but=NULL; block= uiNewBlock(&curarea->uiblocks, "object_fluidsim", UI_EMBOSS, UI_HELV, curarea->win); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16832] branches/harmonic-skeleton/source/ blender/src/autoarmature.c: fix bug with adjust retarget and control bones
Revision: 16832
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16832
Author: theeth
Date: 2008-09-29 22:21:46 +0200 (Mon, 29 Sep 2008)
Log Message:
---
fix bug with adjust retarget and control bones
Modified Paths:
--
branches/harmonic-skeleton/source/blender/src/autoarmature.c
Modified: branches/harmonic-skeleton/source/blender/src/autoarmature.c
===
--- branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-09-29 20:13:40 UTC (rev 16831)
+++ branches/harmonic-skeleton/source/blender/src/autoarmature.c
2008-09-29 20:21:46 UTC (rev 16832)
@@ -159,6 +159,7 @@
typedef struct RigControl {
struct RigControl *next, *prev;
+ float head[3], tail[3];
EditBone *bone;
EditBone *link;
float up_axis[3];
@@ -471,6 +472,8 @@
{
RigControl *ctrl = newRigControl(rg);
ctrl->bone = bone;
+ VECCOPY(ctrl->head, bone->head);
+ VECCOPY(ctrl->tail, bone->tail);
getEditBoneRollUpAxis(bone, bone->roll, ctrl->up_axis);
BLI_ghash_insert(rg->controls_map, bone->name, ctrl);
@@ -1473,7 +1476,7 @@
RigControl *ctrl_child;
float parent_offset[3], tail_offset[3];
- VecSubf(tail_offset, ctrl->bone->tail, ctrl->bone->head);
+ VecSubf(tail_offset, ctrl->tail, ctrl->head);
VecMulf(tail_offset, resize);
VECCOPY(parent_offset, ctrl->offset);
@@ -1509,7 +1512,7 @@
bone = edge->bone;
- VecSubf(v1, bone->tail, bone->head);
+ VecSubf(v1, edge->tail, edge->head);
VecSubf(v2, vec1, vec0);
l1 = Normalize(v1);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16831] trunk/blender/source/blender: Add 2 items to CTL-A menu: Scale to ObData and Rotation to ObData.
Revision: 16831
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16831
Author: ben2610
Date: 2008-09-29 22:13:40 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Add 2 items to CTL-A menu: Scale to ObData and Rotation to ObData. These
options allows to apply separately the scale and the rotation to the object
data. Usefull to physics compound objects that do not support scaling.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/include/BDR_editobject.h
trunk/blender/source/blender/src/editobject.c
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===
--- trunk/blender/source/blender/blenkernel/BKE_object.h2008-09-29
18:10:42 UTC (rev 16830)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h2008-09-29
20:13:40 UTC (rev 16831)
@@ -88,6 +88,8 @@
void disable_speed_curve(int val);
float bsystem_time(struct Object *ob, float cfra, float ofs);
+void object_scale_to_mat3(struct Object *ob, float mat[][3]);
+void object_rot_to_mat3(struct Object *ob, float mat[][3]);
void object_to_mat3(struct Object *ob, float mat[][3]);
void object_to_mat4(struct Object *ob, float mat[][4]);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
18:10:42 UTC (rev 16830)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
20:13:40 UTC (rev 16831)
@@ -1479,23 +1479,43 @@
return cfra;
}
-void object_to_mat3(Object *ob, float mat[][3])/* no parent */
+void object_scale_to_mat3(Object *ob, float mat[][3])
{
- float smat[3][3], vec[3];
- float rmat[3][3];
- /*float q1[4];*/
-
- /* size */
+ float vec[3];
if(ob->ipo) {
vec[0]= ob->size[0]+ob->dsize[0];
vec[1]= ob->size[1]+ob->dsize[1];
vec[2]= ob->size[2]+ob->dsize[2];
- SizeToMat3(vec, smat);
+ SizeToMat3(vec, mat);
}
else {
- SizeToMat3(ob->size, smat);
+ SizeToMat3(ob->size, mat);
}
+}
+void object_rot_to_mat3(Object *ob, float mat[][3])
+{
+ float vec[3];
+ if(ob->ipo) {
+ vec[0]= ob->rot[0]+ob->drot[0];
+ vec[1]= ob->rot[1]+ob->drot[1];
+ vec[2]= ob->rot[2]+ob->drot[2];
+ EulToMat3(vec, mat);
+ }
+ else {
+ EulToMat3(ob->rot, mat);
+ }
+}
+
+void object_to_mat3(Object *ob, float mat[][3])/* no parent */
+{
+ float smat[3][3];
+ float rmat[3][3];
+ /*float q1[4];*/
+
+ /* size */
+ object_scale_to_mat3(ob, smat);
+
/* rot */
/* Quats arnt used yet */
/*if(ob->transflag & OB_QUAT) {
@@ -1508,15 +1528,7 @@
}
}
else {*/
- if(ob->ipo) {
- vec[0]= ob->rot[0]+ob->drot[0];
- vec[1]= ob->rot[1]+ob->drot[1];
- vec[2]= ob->rot[2]+ob->drot[2];
- EulToMat3(vec, rmat);
- }
- else {
- EulToMat3(ob->rot, rmat);
- }
+ object_rot_to_mat3(ob, rmat);
/*}*/
Mat3MulMat3(mat, rmat, smat);
}
Modified: trunk/blender/source/blender/include/BDR_editobject.h
===
--- trunk/blender/source/blender/include/BDR_editobject.h 2008-09-29
18:10:42 UTC (rev 16830)
+++ trunk/blender/source/blender/include/BDR_editobject.h 2008-09-29
20:13:40 UTC (rev 16831)
@@ -77,6 +77,8 @@
void make_links(short event);
void make_duplilist_real(void);
void apply_objects_locrot(void);
+void apply_objects_scale(void);
+void apply_objects_rot(void);
void apply_objects_visual_tx(void);
void apply_object(void);
Modified: trunk/blender/source/blender/src/editobject.c
===
--- trunk/blender/source/blender/src/editobject.c 2008-09-29 18:10:42 UTC
(rev 16830)
+++ trunk/blender/source/blender/src/editobject.c 2008-09-29 20:13:40 UTC
(rev 16831)
@@ -3938,7 +3938,7 @@
BIF_undo_push("Create links");
}
-void apply_objects_locrot( void )
+static void apply_objects_internal( int apply_scale, int apply_rot )
{
Base *base, *basact;
Object *ob;
@@ -3952,7 +3952,11 @@
float mat[3][3];
int a, change = 0;
-
+ if (!apply_scale && !apply_rot) {
+ /* do nothing? */
+ error("Nothing to do!");
+ return;
+ }
/* first check
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16830] trunk/blender/CMakeLists.txt: Do not include manifest file for x64 + Windows, was creating errors on other system
Revision: 16830
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16830
Author: genscher
Date: 2008-09-29 20:10:42 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Do not include manifest file for x64 + Windows, was creating errors on other
system
Modified Paths:
--
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2008-09-29 17:55:11 UTC (rev 16829)
+++ trunk/blender/CMakeLists.txt2008-09-29 18:10:42 UTC (rev 16830)
@@ -327,7 +327,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64
/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16829] trunk/blender/source/blender/ render/intern: Bugfix #17711
Revision: 16829
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16829
Author: ton
Date: 2008-09-29 19:55:11 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Bugfix #17711
SunSky didn't include skycolor in raytrace.
Note: there seems to be an error in sunsky when looking straight down,
so this option requires raytracing stuff not in outer space. :)
Modified Paths:
--
trunk/blender/source/blender/render/intern/include/pixelshading.h
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/rayshade.c
Modified: trunk/blender/source/blender/render/intern/include/pixelshading.h
===
--- trunk/blender/source/blender/render/intern/include/pixelshading.h
2008-09-29 17:46:25 UTC (rev 16828)
+++ trunk/blender/source/blender/render/intern/include/pixelshading.h
2008-09-29 17:55:11 UTC (rev 16829)
@@ -56,7 +56,7 @@
void shadeSkyPixel(float *collector, float fx, float fy);
void shadeSkyView(float *colf, float *rco, float *view, float *dxyview);
void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float
fy, float distance);
-
+void shadeSunView(float *colf, float *view);
/* - */
#endif
Modified: trunk/blender/source/blender/render/intern/source/pixelshading.c
===
--- trunk/blender/source/blender/render/intern/source/pixelshading.c
2008-09-29 17:46:25 UTC (rev 16828)
+++ trunk/blender/source/blender/render/intern/source/pixelshading.c
2008-09-29 17:55:11 UTC (rev 16829)
@@ -570,27 +570,37 @@
}
/* shade sky according to sun lamps, all parameters are like shadeSkyView
except sunsky*/
-void shadeSunView(struct SunSky *sunsky, float *colf, float *rco, float *view,
float *dxyview)
+void shadeSunView(float *colf, float *view)
{
- float colorxyz[3];
+ GroupObject *go;
+ LampRen *lar;
+ float sview[3];
+ int do_init= 1;
+
+ for(go=R.lights.first; go; go= go->next) {
+ lar= go->lampren;
+ if(lar->type==LA_SUN && lar->sunsky &&
(lar->sunsky->effect_type & LA_SUN_EFFECT_SKY)){
+ float sun_collector[3];
+ float colorxyz[3];
- /**
- sunAngle = sqrt(sunsky->sunSolidAngle / M_PI);
-
- sunDir[0] = sunsky->toSun[0];
- sunDir[1] = sunsky->toSun[1];
- sunDir[2] = sunsky->toSun[2];
- */
+ if(do_init) {
+
+ VECCOPY(sview, view);
+ Normalize(sview);
+ MTC_Mat3MulVecfl(R.imat, sview);
+ if (sview[2] < 0.0)
+ sview[2] = 0.0;
+ Normalize(sview);
+ do_init= 0;
+ }
- Normalize(view);
- MTC_Mat3MulVecfl(R.imat, view);
- if (view[2] < 0.0)
- view[2] = 0.0;
- Normalize(view);
-
- GetSkyXYZRadiancef(sunsky, view, colorxyz);
-
- xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2], &colf[0], &colf[1],
&colf[2], sunsky->sky_colorspace);
+ GetSkyXYZRadiancef(lar->sunsky, sview, colorxyz);
+ xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2],
&sun_collector[0], &sun_collector[1], &sun_collector[2],
+ lar->sunsky->sky_colorspace);
+
+ ramp_blend(lar->sunsky->skyblendtype, colf, colf+1,
colf+2, lar->sunsky->skyblendfac, sun_collector);
+ }
+ }
}
@@ -599,8 +609,6 @@
*/
void shadeSkyPixel(float *collector, float fx, float fy)
{
- GroupObject *go;
- LampRen *lar;
float view[3], dxyview[2];
/*
@@ -648,19 +656,9 @@
shadeSkyView(collector, NULL, view, dxyview);
collector[3] = 0.0f;
}
-
- for(go=R.lights.first; go; go= go->next) {
- lar= go->lampren;
- if(lar->type==LA_SUN && lar->sunsky &&
(lar->sunsky->effect_type & LA_SUN_EFFECT_SKY)){
- float sun_collector[3];
-
- calc_view_vector(view, fx, fy);
- Normalize(view);
-
- shadeSunView(lar->sunsky, sun_collector, NULL, view,
NULL);
- ramp_blend(lar->sunsky->skyblendtype, collector,
collector+1, collector+2, lar->sunsky->skyblendfac, sun_collector);
- }
- }
+
+ calc_view_vector(view, fx, fy);
+ shadeSunView(collector, view);
}
/* aerial
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16828] trunk/blender/source/gameengine/ Physics/Bullet/CcdPhysicsController.cpp: BGE patch: fix force application on soft body.
Revision: 16828
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16828
Author: ben2610
Date: 2008-09-29 19:46:25 +0200 (Mon, 29 Sep 2008)
Log Message:
---
BGE patch: fix force application on soft body. Force is applied on each node,
it must be reduced by the same extend.
Modified Paths:
--
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Modified:
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2008-09-29 17:08:11 UTC (rev 16827)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2008-09-29 17:46:25 UTC (rev 16828)
@@ -962,8 +962,12 @@
body->applyCentralForce(force);
btSoftBody* soft = GetSoftBody();
if (soft)
+ {
+ // the force is applied on each node, must
reduce it in the same extend
+ if (soft->m_nodes.size() > 0)
+ force /= soft->m_nodes.size();
soft->addForce(force);
-
+ }
}
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16827] trunk/blender: resolve some compiler warnings with intel c/c++ compiler
Revision: 16827 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16827 Author: campbellbarton Date: 2008-09-29 19:08:11 +0200 (Mon, 29 Sep 2008) Log Message: --- resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static Modified Paths: -- trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp trunk/blender/source/blender/blenkernel/BKE_writeframeserver.h trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c trunk/blender/source/blender/blenkernel/intern/customdata.c trunk/blender/source/blender/blenkernel/intern/displist.c trunk/blender/source/blender/blenkernel/intern/idprop.c trunk/blender/source/blender/blenkernel/intern/image.c trunk/blender/source/blender/blenkernel/intern/modifier.c trunk/blender/source/blender/blenkernel/intern/particle.c trunk/blender/source/blender/blenkernel/intern/particle_system.c trunk/blender/source/blender/blenkernel/intern/softbody.c trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c trunk/blender/source/blender/blenkernel/intern/writeframeserver.c trunk/blender/source/blender/blenlib/intern/arithb.c trunk/blender/source/blender/blenlib/intern/bpath.c trunk/blender/source/blender/blenlib/intern/psfont.c trunk/blender/source/blender/blenloader/BLO_soundfile.h trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/blenloader/intern/writefile.c trunk/blender/source/blender/include/BIF_editmesh.h trunk/blender/source/blender/include/BIF_editparticle.h trunk/blender/source/blender/include/BIF_retopo.h trunk/blender/source/blender/python/BPY_interface.c trunk/blender/source/blender/python/api2_2x/Armature.c trunk/blender/source/blender/python/api2_2x/Draw.c trunk/blender/source/blender/python/api2_2x/Geometry.c trunk/blender/source/blender/python/api2_2x/Group.c trunk/blender/source/blender/python/api2_2x/IDProp.c trunk/blender/source/blender/python/api2_2x/Ipo.c trunk/blender/source/blender/python/api2_2x/Material.c trunk/blender/source/blender/python/api2_2x/Mesh.c trunk/blender/source/blender/python/api2_2x/NMesh.c trunk/blender/source/blender/python/api2_2x/Object.c trunk/blender/source/blender/python/api2_2x/Scene.c trunk/blender/source/blender/python/api2_2x/Sys.c trunk/blender/source/blender/python/api2_2x/Window.c trunk/blender/source/blender/python/api2_2x/bpy_data.c trunk/blender/source/blender/python/api2_2x/constant.c trunk/blender/source/blender/python/api2_2x/matrix.c trunk/blender/source/blender/python/api2_2x/sceneRender.c trunk/blender/source/blender/python/api2_2x/sceneSequence.c trunk/blender/source/blender/radiosity/intern/source/radfactors.c trunk/blender/source/blender/radiosity/intern/source/radnode.c trunk/blender/source/blender/radiosity/intern/source/radpreprocess.c trunk/blender/source/blender/render/intern/source/convertblender.c trunk/blender/source/blender/render/intern/source/initrender.c trunk/blender/source/blender/render/intern/source/occlusion.c trunk/blender/source/blender/render/intern/source/rayshade.c trunk/blender/source/blender/render/intern/source/shadeoutput.c trunk/blender/source/blender/render/intern/source/texture.c trunk/blender/source/blender/src/buttons_editing.c trunk/blender/source/blender/src/buttons_logic.c trunk/blender/source/blender/src/drawimage.c trunk/blender/source/blender/src/drawtext.c trunk/blender/source/blender/src/drawview.c trunk/blender/source/blender/src/edit.c trunk/blender/source/blender/src/editface.c trunk/blender/source/blender/src/editmesh.c trunk/blender/source/blender/src/editmesh_add.c trunk/blender/source/blender/src/editmesh_loop.c trunk/blender/source/blender/src/editmesh_tools.c trunk/blender/source/blender/src/editparticle.c trunk/blender/source/blender/src/editsima.c trunk/blender/source/blender/src/editsound.c trunk/blender/source/blender/src/meshtools.c trunk/blender/source/blender/src/parametrizer.c trunk/blender/source/blender/src/retopo.c trunk/blender/source/blender/src/sculptmode.c trunk/blender/source/blender/src/seqaudio.c trunk/blender/source/ble
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16826] trunk/blender/source/blender: Updated color calculus for sunsky
Revision: 16826
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16826
Author: ton
Date: 2008-09-29 19:03:24 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Updated color calculus for sunsky
- removed ugly clamping function (it was dividing XYZ based on max of
one of the values)
- added option to use Exposure, this only works for brightness (Y).
results look very pleasant, foggy and hazy results are possible.
with exposre==0, no exposure happens for HDR extreme range skies,
this is how yafray rendered it.
- added menu for choosing color spaces (CIE = modern lcds)
Please review! (and yes i know it's still not in World :)
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesdna/DNA_lamp_types.h
trunk/blender/source/blender/render/intern/include/sunsky.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/src/buttons_shading.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2008-09-29
15:50:50 UTC (rev 16825)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2008-09-29
17:03:24 UTC (rev 16826)
@@ -41,7 +41,7 @@
struct MemFile;
#define BLENDER_VERSION247
-#define BLENDER_SUBVERSION 8
+#define BLENDER_SUBVERSION 9
#define BLENDER_MINVERSION 245
#define BLENDER_MINSUBVERSION 15
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
15:50:50 UTC (rev 16825)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2008-09-29
17:03:24 UTC (rev 16826)
@@ -758,7 +758,9 @@
la->sun_intensity = 1.0;
la->skyblendtype= MA_RAMP_ADD;
la->skyblendfac= 1.0f;
-
+ la->sky_colorspace= BLI_CS_CIE;
+ la->sky_exposure= 1.0f;
+
curvemapping_initialize(la->curfalloff);
return la;
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2008-09-29
15:50:50 UTC (rev 16825)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2008-09-29
17:03:24 UTC (rev 16826)
@@ -7920,6 +7920,15 @@
}
}
+ if (main->versionfile < 247 || (main->versionfile == 247 &&
main->subversionfile < 9)) {
+ Lamp *la= main->lamp.first;
+ for(; la; la= la->id.next) {
+ la->sky_exposure= 1.0f;
+ }
+ }
+
+
+
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
Modified: trunk/blender/source/blender/makesdna/DNA_lamp_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2008-09-29
15:50:50 UTC (rev 16825)
+++ trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2008-09-29
17:03:24 UTC (rev 16826)
@@ -91,7 +91,9 @@
float atm_extinction_factor;
float atm_distance_factor;
float skyblendfac;
-
+ float sky_exposure;
+ short sky_colorspace, pad4;
+
/* yafray: photonlight params */
int YF_numphotons, YF_numsearch;
short YF_phdepth, YF_useqmc, YF_bufsize, YF_pad;
Modified: trunk/blender/source/blender/render/intern/include/sunsky.h
===
--- trunk/blender/source/blender/render/intern/include/sunsky.h 2008-09-29
15:50:50 UTC (rev 16825)
+++ trunk/blender/source/blender/render/intern/include/sunsky.h 2008-09-29
17:03:24 UTC (rev 16826)
@@ -33,7 +33,7 @@
typedef struct SunSky
{
-short effect_type, skyblendtype;
+short effect_type, skyblendtype, sky_colorspace;
float turbidity;
float theta, phi;
@@ -54,6 +54,7 @@
float sun_size;
float backscattered_light;
float skyblendfac;
+ float sky_exposure;
float atm_HGg;
@@ -86,7 +87,7 @@
* */
void InitSunSky(struct SunSky *sunsky, float turb, float *toSun, float
horizon_brightness,
float spread,float sun_brightness, float
sun_size, float back_scatter,
- float skyblendfac, short skyblendty
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16825] branches/soc-2008-mxcurioni/source /blender/freestyle: soc-2008-mxcurioni: moved the style module and data files to Blender's standard directo
Revision: 16825
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16825
Author: mxcurioni
Date: 2008-09-29 17:50:50 +0200 (Mon, 29 Sep 2008)
Log Message:
---
soc-2008-mxcurioni: moved the style module and data files to Blender's standard
directory (.blender/scripts/freestyle), cleaned up some useless files. As of
this revision, the environment variable FREESTYLE_BLENDER_DIR is NOT needed
anymore
Modified Paths:
--
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
Added Paths:
---
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_old/
Removed Paths:
-
branches/soc-2008-mxcurioni/source/blender/freestyle/data/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Makefile.pro
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/build_bundle.macosx.py
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/libconfig.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.release.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
===
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
2008-09-29 15:02:20 UTC (rev 16824)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppConfig.cpp
2008-09-29 15:50:50 UTC (rev 16825)
@@ -22,20 +22,23 @@
#include
#include "../system/StringUtils.h"
-
using namespace std;
+extern "C" {
+ #include "api2_2x/EXPP_interface.h"
+}
+
namespace Config {
Path* Path::_pInstance = 0;
Path::Path() {
// get the root directory
//soc
- setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
+ setRootDir( bpy_gethome(1) );
_pInstance = this;
}
void Path::setRootDir(const string& iRootDir) {
- _ProjectDir = iRootDir;
+ _ProjectDir = iRootDir + string(DIR_SEP.c_str()) + "freestyle";
_ModelsPath = "";
_PatternsPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
+ string(DIR_SEP.c_str()) + "textures" +
string(DIR_SEP.c_str())
@@ -43,9 +46,8 @@
_BrushesPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
+ string(DIR_SEP.c_str()) + "textures" +
string(DIR_SEP.c_str())
+ "brushes" + string(DIR_SEP.c_str());
- _PythonPath = _ProjectDir + string(DIR_SEP.c_str()) + "python"
- + string(PATH_SEP.c_str()) + _ProjectDir +
string(DIR_SEP.c_str())
- + "style_modules_blender" + string(DIR_SEP.c_str()) ;
+ _PythonPath = _ProjectDir + string(DIR_SEP.c_str())
++ "style_modules" + string(DIR_SEP.c_str()) ;
if (getenv("PYTHONPATH")) {
_PythonPath += string(PATH_SEP.c_str()) +
string(getenv("PYTHONPATH"));
}
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
===
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
2008-09-29 15:02:20 UTC (rev 16824)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
2008-09-29 15:50:50 UTC (rev 16825)
@@ -48,7 +48,7 @@
controller->Clear();
if( strlen(style_module) == 0 ){
- string path( pathconfig->getProjectDir() +
Config::DIR_SEP + "style_modules_blender" + Config::DIR_SEP + "contour.py" );
+ string path( pathconfig->getProjectDir() +
Config::DIR_SEP + "style_modules" + Config::DIR_SEP + "contour.py" );
strcpy( style_module, path.c_str() );
}
Deleted: branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
===
--- branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
2008-09-29 15:02:20 UTC (rev 16
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16824] trunk/blender: Move Korean file from kr to ko also updated it to newer file.
Revision: 16824
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16824
Author: sirdude
Date: 2008-09-29 17:02:20 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Move Korean file from kr to ko also updated it to newer file.
Kent
Modified Paths:
--
trunk/blender/bin/.blender/.Blanguages
trunk/blender/po/Makefile
Added Paths:
---
trunk/blender/bin/.blender/locale/ko/
trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/
trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
trunk/blender/po/ko.po
Removed Paths:
-
trunk/blender/bin/.blender/locale/kr/
trunk/blender/po/kr.po
Modified: trunk/blender/bin/.blender/.Blanguages
===
--- trunk/blender/bin/.blender/.Blanguages 2008-09-29 14:44:12 UTC (rev
16823)
+++ trunk/blender/bin/.blender/.Blanguages 2008-09-29 15:02:20 UTC (rev
16824)
@@ -20,4 +20,4 @@
Arabic:ar
Bulgarian:bg
Greek:el
-Korean:kr
+Korean:ko
Added: trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===
(Binary files differ)
Property changes on: trunk/blender/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
___
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/blender/po/Makefile
===
--- trunk/blender/po/Makefile 2008-09-29 14:44:12 UTC (rev 16823)
+++ trunk/blender/po/Makefile 2008-09-29 15:02:20 UTC (rev 16824)
@@ -33,7 +33,7 @@
include nan_definitions.mk
-LINGUAS = ar bg ca cs de el es fi fr hr it ja nl pl pt_BR ro ru sr [EMAIL
PROTECTED] sv uk zh_CN
+LINGUAS = ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr [EMAIL
PROTECTED] sv uk zh_CN
ifeq ($(OS), darwin)
DIR = $(OCGDIR)/bin/blender.app/Contents/Resources/locale/$@/LC_MESSAGES/
Added: trunk/blender/po/ko.po
===
--- trunk/blender/po/ko.po (rev 0)
+++ trunk/blender/po/ko.po 2008-09-29 15:02:20 UTC (rev 16824)
@@ -0,0 +1,20531 @@
+msgid ""
+msgstr ""
+": \n"
+"Project-Id-Version: blender ver 2.4.6\n"
+"PO-Revision-Date: 2008-08-13 08:23+0900\n"
+"Last-Translator: J.H. Jeong <[EMAIL PROTECTED]>\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.0.2\n"
+"X-Poedit-Language: korean\n"
+"X-Poedit-Country: KOREA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Rosetta-Export-Date: 2008-06-05\n"
+"POT-Creation-Date: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+
+msgid " - sys evt"
+msgstr " - sys evt"
+
+msgid "Global Undo History "
+msgstr "전역 실행 취소 내역"
+
+msgid "-1W "
+msgstr "-1W "
+
+msgid "DataBrowse "
+msgstr "자료찾기 "
+
+msgid "blendfile"
+msgstr "Blend파일"
+
+msgid "[Bone Dict: {"
+msgstr "[골격 용어: {"
+
+msgid "}]\n"
+msgstr "}]\n"
+
+msgid "Grid"
+msgstr "격자"
+
+msgid "Outside"
+msgstr "바깥"
+
+msgid "[Pose Bone Dict: {"
+msgstr "[자세 골격 사전: {"
+
+msgid "warning: cannot assign more than 16 materials to 1 mesh"
+msgstr "경고: 한 개 망사에 16개 이상 재질 할당할 수 없음"
+
+msgid "Can't edit library data"
+msgstr "라이브러리 자료 편집 불가"
+
+msgid "New material"
+msgstr "새 재질"
+
+msgid "Delete material index"
+msgstr "재질 목록 삭제"
+
+msgid "Assign material index"
+msgstr "재질 목록 할당"
+
+msgid "Select material index"
+msgstr "재질 목록 선택"
+
+msgid "Set Smooth"
+msgstr "부드러움 설정"
+
+msgid "Set Solid"
+msgstr "입체 설정"
+
+msgid "Mesh"
+msgstr "망사"
+
+msgid "Editing"
+msgstr "편집"
+
+msgid "Auto Smooth"
+msgstr "자동 부드러움"
+
+msgid "Treats all set-smoothed faces with angles less than Degr: as 'smooth'
during render"
+msgstr "각도이하의 각을 가진 전체 부드러움으로 설정된 면을 다룸: 렌더동안 '부드러움'처럼 "
+
+msgid "Degr:"
+msgstr "각도:"
+
+msgid "Defines maximum angle between face normals that 'Auto Smooth' will
operate on"
+msgstr "자동 부드러움을 실행하는 면들 사이에서 최대 각을 정의"
+
+msgid "VertCol"
+msgstr "정점 색상"
+
+msgid "Make"
+msgstr "생성"
+
+msgid "Enables vertex color painting on active Mesh"
+msgstr "활성 망사에서 정점 색상 칠하기 가능"
+
+msgid "Delete"
+msgstr "삭제"
+
+msgid "Deletes vertex colors on active Mesh"
+msgstr "활성 망사에서 정점 색상을 삭제"
+
+msgid "TexFace"
+msgstr "바탕결면"
+
+msgid "Enables the active Mesh's faces for UV coordinate mapping"
+msgstr "UV 좌표맵을 위한 활성 망사면 가능"
+
+msgid "Deletes UV coordinates for active Mesh's faces"
+msgstr "활성 망사면을 위한 UV 좌표 삭제"
+
+msgid "Sticky"
+msgstr "스티키"
+
+msgid "Creates Sticky coordinates for the active Mesh from the current camera
view background picture"
+msgstr "현재 카메라 보기 배경 그림으로부터 활성 망사를 위한 스티키 좌표를 생성"
+
+msgid "Deletes Sticky texture coordinates"
+msgstr "스티키 바탕결 좌표 삭제"
+
+msgid "Slurph:"
+msgstr "Slurph:"
+
+msgid "Relative Keys"
+msgstr "상대적인 키"
+
+msgid "SlowerDraw"
+msgstr "느리게 그리기"
+
+msgid "Displays the active object with all possible edges shown"
+msgstr "전체 모서리가 보이는 활성 객체 보이기"
+
+msgid "FasterDraw"
+msgstr
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16823] trunk/blender/intern/elbeem/intern /solver_control.cpp: [#17703] Segfault on fluid activation.
Revision: 16823
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16823
Author: genscher
Date: 2008-09-29 16:44:12 +0200 (Mon, 29 Sep 2008)
Log Message:
---
[#17703] Segfault on fluid activation.
Modified Paths:
--
trunk/blender/intern/elbeem/intern/solver_control.cpp
Modified: trunk/blender/intern/elbeem/intern/solver_control.cpp
===
--- trunk/blender/intern/elbeem/intern/solver_control.cpp 2008-09-29
14:20:27 UTC (rev 16822)
+++ trunk/blender/intern/elbeem/intern/solver_control.cpp 2008-09-29
14:44:12 UTC (rev 16823)
@@ -420,6 +420,10 @@
return;
}
+ // check if we have control objects
+ if(mpControl->mCons.size()==0)
+ return;
+
if((mpControl->mCpUpdateInterval<1) ||
(this->mStepCnt%mpControl->mCpUpdateInterval==0)) {
// do full reinit later on...
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16822] trunk/blender/source/blender/ blenkernel/intern/collision.c: [#17707] Slow Cloth Baking
Revision: 16822
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16822
Author: genscher
Date: 2008-09-29 16:20:27 +0200 (Mon, 29 Sep 2008)
Log Message:
---
[#17707] Slow Cloth Baking
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/collision.c
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2008-09-29
14:03:15 UTC (rev 16821)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2008-09-29
14:20:27 UTC (rev 16822)
@@ -1307,6 +1307,10 @@
// check all collision objects
for ( base = G.scene->base.first; base; base = base->next )
{
+ /*Only proceed for mesh object in same layer */
+ if(!(base->object->type==OB_MESH && (base->lay & self->lay)))
+ continue;
+
coll_ob = base->object;
if(coll_ob->pd && coll_ob->pd->deflect)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16821] trunk/blender/release/scripts/ export_dxf.py: DXF-Exporter script - initial commit
Revision: 16821 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16821 Author: migius Date: 2008-09-29 16:03:15 +0200 (Mon, 29 Sep 2008) Log Message: --- DXF-Exporter script - initial commit Built on "Stanis Python Library for generating dxf drawing": History: v1.25 - 2008.09.28 by migius - modif FACE class for r12 - add mesh-polygon -> Bezier-curve converter (Yorik's code) - add support for curves ->POLYLINEs - add "3d-View to Flat" - geometry projection to XY-plane v1.24 - 2008.09.27 by migius - add start UI with preferences - modif POLYLINE class for r12 - changing output format from r9 to r12(AC1009) v1.23 - 2008.09.26 by migius - add finish message-box v1.22 - 2008.09.26 by migius - add support for curves ->LINEs - add support for mesh-edges ->LINEs v1.21 - 2008.06.04 by migius - initial adaptation for Blender v1.1 (20/6/2005) by www.stani.be/python/sdxf - Python library to generate dxf drawings Added Paths: --- trunk/blender/release/scripts/export_dxf.py Added: trunk/blender/release/scripts/export_dxf.py === --- trunk/blender/release/scripts/export_dxf.py (rev 0) +++ trunk/blender/release/scripts/export_dxf.py 2008-09-29 14:03:15 UTC (rev 16821) @@ -0,0 +1,860 @@ +#!BPY + +""" + Name: 'Autodesk DXF (.dxf)' + Blender: 247 + Group: 'Export' + Tooltip: 'Export geometry to DXF-r12 (Drawing eXchange Format).' +""" + +__version__ = "v1.25beta - 2008.09.28" +__author__ = "Stani & migius(Remigiusz Fiedler)" +__license__ = "GPL" +__url__ = "http://wiki.blender.org/index.php/Scripts/Manual/Export/autodesk_dxf"; +__bpydoc__ ="""The script exports Blender geometry to DXF format r12 version. + +Copyright %s +Version %s +License %s +Homepage %s + +See the homepage for documentation. +url: +""" % (__author__,__version__,__license__,__url__) + +""" +IDEAs: + - correct normals for POLYLINE-POLYFACE objects via correct point-order + - HPGL output for 2d and flattened3d content + +TODO: + - support hierarchies: groups, instances, parented structures + - support 210-code (3d orientation vector) + - presets for architectural scales + +History +v1.25 - 2008.09.28 by migius + - modif FACE class for r12 + - add mesh-polygon -> Bezier-curve converter (Yorik's code) + - add support for curves ->POLYLINEs + - add "3d-View to Flat" - geometry projection to XY-plane +v1.24 - 2008.09.27 by migius + - add start UI with preferences + - modif POLYLINE class for r12 + - changing output format from r9 to r12(AC1009) +v1.23 - 2008.09.26 by migius + - add finish message-box +v1.22 - 2008.09.26 by migius + - add support for curves ->LINEs + - add support for mesh-edges ->LINEs +v1.21 - 2008.06.04 by migius + - initial adaptation for Blender +v1.1 (20/6/2005) by www.stani.be/python/sdxf + - Python library to generate dxf drawings +__ +""" +# * BEGIN GPL LICENSE BLOCK * +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# * END GPL LICENCE BLOCK * + + +import Blender +from Blender import Mathutils, Window, Scene, sys, Draw +import BPyMessages + +try: + import copy + #from struct import pack +except: + copy = None + +1) Private (only for developpers) +_HEADER_POINTS=['insbase','extmin','extmax'] + +#---helper functions--- +def _point(x,index=0): + """Convert tuple to a dxf point""" + #print '_point=', x #- + return '\n'.join(['%s\n%s'%((i+1)*10+index,x[i]) for i in range(len(x))]) + +def _points(plist): + """Convert a list of tuples to dxf points""" + return [_point(plist[i],i)for i in range(len(plist))] + +#---base classes +class _Call: + """Makes a callable class.""" + def copy(self): + """Returns a copy.""" + return copy.deepcopy(self) + + def __call__(self,**attrs): + """Returns a copy with modified attributes.""" + copied=self.copy() + for attr in attrs:setattr(copied,attr,attrs[attr]) + return copied + +#--- +cla
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16820] trunk/blender/source/blender/ blenkernel/intern/ipo.c: Bugfix #17708: layer IPOs doesn' t return the correct layer anymore
Revision: 16820
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16820
Author: aligorith
Date: 2008-09-29 13:39:58 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Bugfix #17708: layer IPOs doesn't return the correct layer anymore
When doing IPO-cleanup, added two break statements to hopefully optimise the
evaluation process a teeny-weeny bit. However, that caused more problems than
it was worth!
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/ipo.c
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===
--- trunk/blender/source/blender/blenkernel/intern/ipo.c2008-09-29
10:26:20 UTC (rev 16819)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c2008-09-29
11:39:58 UTC (rev 16820)
@@ -1289,11 +1289,8 @@
if ((prevbezt->vec[1][0] <= evaltime) &&
(bezt->vec[1][0] >= evaltime)) {
/* value depends on interpolation mode
*/
if (icu->ipo == IPO_CONST) {
- /* constant (evaltime not
relevant, as no interpolation needed) */
+ /* constant (evaltime not
relevant, so no interpolation needed) */
cvalue= prevbezt->vec[1][1];
-
- /* value found already, so no
need to keep looping */
- break;
}
else if (icu->ipo == IPO_LIN) {
/* linear - interpolate between
values of the two keyframes */
@@ -1301,14 +1298,11 @@
/* prevent division by zero */
if (fac) {
- fac= (evaltime -
prevbezt->vec[1][0])/fac;
+ fac= (evaltime -
prevbezt->vec[1][0]) / fac;
cvalue=
prevbezt->vec[1][1] + (fac * (bezt->vec[1][1] - prevbezt->vec[1][1]));
}
else
cvalue=
prevbezt->vec[1][1];
-
- /* value found already, so no
need to keep looping */
- break;
}
else {
/* bezier interpolation */
@@ -1677,19 +1671,23 @@
/* this exception cannot be depgraphed yet... what todo with objects in
other layers?... */
for (base= G.scene->base.first; base; base= base->next) {
+ Object *ob= base->object;
+
/* only update layer when an ipo */
- if (has_ipo_code(base->object->ipo, OB_LAY)) {
- do_ob_ipo(base->object);
- base->lay= base->object->lay;
+ if (has_ipo_code(ob->ipo, OB_LAY)) {
+ do_ob_ipo(ob);
+ base->lay= ob->lay;
}
}
/* layers for the set...*/
if (G.scene->set) {
for (base= G.scene->set->base.first; base; base= base->next) {
- if (has_ipo_code(base->object->ipo, OB_LAY)) {
- do_ob_ipo(base->object);
- base->lay= base->object->lay;
+ Object *ob= base->object;
+
+ if (has_ipo_code(ob->ipo, OB_LAY)) {
+ do_ob_ipo(ob);
+ base->lay= ob->lay;
}
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16819] trunk/blender/source/blender: Bugfix #17696
Revision: 16819
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16819
Author: ton
Date: 2008-09-29 12:26:20 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Bugfix #17696
- Area lamp with 1 sample still used an offset for the first sample
- Sample buttons were not visible for area without shadow.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/src/buttons_shading.c
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===
--- trunk/blender/source/blender/render/intern/source/rayshade.c
2008-09-29 09:54:26 UTC (rev 16818)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c
2008-09-29 10:26:20 UTC (rev 16819)
@@ -633,24 +633,27 @@
/* at least 4, or max threads+1 tables */
if(BLENDER_MAX_THREADS < 4) x= 4;
else x= BLENDER_MAX_THREADS+1;
- fp= lar->jitter= MEM_mallocN(x*tot*2*sizeof(float), "lamp jitter tab");
+ fp= lar->jitter= MEM_callocN(x*tot*2*sizeof(float), "lamp jitter tab");
- /* set per-lamp fixed seed */
- BLI_srandom(tot);
-
- /* fill table with random locations, area_size large */
- for(x=0; xarea_size;
- fp[1]= (BLI_frand()-0.5)*lar->area_sizey;
- }
-
- while(iter--) {
- fp= lar->jitter;
- for(x=tot; x>0; x--, fp+=2) {
- DP_energy(lar->jitter, fp, tot, lar->area_size,
lar->area_sizey);
+ /* if 1 sample, we leave table to be zero's */
+ if(tot>1) {
+
+ /* set per-lamp fixed seed */
+ BLI_srandom(tot);
+
+ /* fill table with random locations, area_size large */
+ for(x=0; xarea_size;
+ fp[1]= (BLI_frand()-0.5)*lar->area_sizey;
}
- }
-
+
+ while(iter--) {
+ fp= lar->jitter;
+ for(x=tot; x>0; x--, fp+=2) {
+ DP_energy(lar->jitter, fp, tot, lar->area_size,
lar->area_sizey);
+ }
+ }
+ }
/* create the dithered tables (could just check lamp type!) */
jitter_plane_offset(lar->jitter, lar->jitter+2*tot, tot,
lar->area_size, lar->area_sizey, 0.5f, 0.0f);
jitter_plane_offset(lar->jitter, lar->jitter+4*tot, tot,
lar->area_size, lar->area_sizey, 0.5f, 0.5f);
Modified: trunk/blender/source/blender/src/buttons_shading.c
===
--- trunk/blender/source/blender/src/buttons_shading.c 2008-09-29 09:54:26 UTC
(rev 16818)
+++ trunk/blender/source/blender/src/buttons_shading.c 2008-09-29 10:26:20 UTC
(rev 16819)
@@ -2722,47 +2722,49 @@
}
}
- if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL) && (la->mode &
LA_SHAD_RAY)) {
+ if(ELEM4(la->type, LA_AREA, LA_SPOT, LA_SUN, LA_LOCAL)) {
- if (ELEM3(la->type, LA_SPOT, LA_SUN, LA_LOCAL)) {
- if (la->ray_samp_method == LA_SAMP_CONSTANT)
la->ray_samp_method = LA_SAMP_HALTON;
-
- uiDefButS(block, MENU, B_REDR, "Adaptive QMC
%x1|Constant QMC %x2",
- 100,110,200,19, &la->ray_samp_method, 0, 0, 0,
0, "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC
is less noisy but slower");
-
- uiDefButF(block, NUM,B_LAMPREDRAW,"Soft Size",
100,80,200,19, &la->area_size, 0.01, 100.0, 10, 0, "Area light size, doesn't
affect energy amount");
+ if(la->mode & LA_SHAD_RAY) {
+ if (ELEM3(la->type, LA_SPOT, LA_SUN, LA_LOCAL)) {
+ if (la->ray_samp_method == LA_SAMP_CONSTANT)
la->ray_samp_method = LA_SAMP_HALTON;
- uiDefButS(block, NUM,0,"Samples:", 100,60,200,19,
&la->ray_samp, 1.0, 16.0, 100, 0, "Sets the amount of samples taken extra (samp
x samp)");
- if (la->ray_samp_method == LA_SAMP_HALTON)
- uiDefButF(block, NUM,0,"Threshold:",
100,40,200,19, &la->adapt_thresh, 0.0, 1.0, 100, 0, "Threshold for adaptive
sampling, to control what level is considered already in shadow");
+ uiDefButS(block, MENU, B_REDR, "Adaptive QMC
%x1|Constant QMC %x2",
+ 100,110,200,19, &la->ray_samp_method,
0, 0, 0, 0, "Method for generating shadow samples: Adaptive QMC is fastest,
Constant QMC is less noisy but slower");
+
+ uiDefButF(block, NUM,B_LAMPREDRAW,"Soft Size",
100,80,200,19
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16818] trunk/blender/source/blender/src/ toets.c: rewiten a if statment
Revision: 16818
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16818
Author: pidhash
Date: 2008-09-29 11:54:26 +0200 (Mon, 29 Sep 2008)
Log Message:
---
rewiten a if statment
Modified Paths:
--
trunk/blender/source/blender/src/toets.c
Modified: trunk/blender/source/blender/src/toets.c
===
--- trunk/blender/source/blender/src/toets.c2008-09-29 09:50:16 UTC (rev
16817)
+++ trunk/blender/source/blender/src/toets.c2008-09-29 09:54:26 UTC (rev
16818)
@@ -299,7 +299,7 @@
G.vd->lpersp= G.vd->persp;
G.vd->lastview_set= 1;
}
- else if(G.vd->lastview_set) {
+ else {
/* return to settings of last view */
axis_set_view(G.vd->lviewquat[0],
G.vd->lviewquat[1], G.vd->lviewquat[2], G.vd->lviewquat[3], G.vd->lview,
G.vd->lpersp);
G.vd->lastview_set= 0;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16817] trunk/blender/source/blender/ render/intern/source/convertblender.c: Bugfix #17687
Revision: 16817 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16817 Author: ton Date: 2008-09-29 11:50:16 +0200 (Mon, 29 Sep 2008) Log Message: --- Bugfix #17687 Scaled cameras get orthogonalized on render, and did not get a signal to refresh the matrix, resulting in wrong display of camera in 3d win. Modified Paths: -- trunk/blender/source/blender/render/intern/source/convertblender.c Modified: trunk/blender/source/blender/render/intern/source/convertblender.c === --- trunk/blender/source/blender/render/intern/source/convertblender.c 2008-09-29 08:11:26 UTC (rev 16816) +++ trunk/blender/source/blender/render/intern/source/convertblender.c 2008-09-29 09:50:16 UTC (rev 16817) @@ -4789,6 +4789,7 @@ Mat4Ortho(re->scene->camera->obmat); Mat4Invert(mat, re->scene->camera->obmat); RE_SetView(re, mat); + re->scene->camera->recalc= OB_RECALC_OB; /* force correct matrix for scaled cameras */ } init_render_world(re); /* do first, because of ambient. also requires re->osa set correct */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16816] trunk/blender/source/blender: Bugfix:
Revision: 16816
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16816
Author: aligorith
Date: 2008-09-29 10:11:26 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Bugfix:
Recoded pidhash's recent Pad0 (Lastview) commits (r.16802 and r.16810). It was
causing major issues with Ortho perspective + rotating the view with the MMB.
Setting G.vd->view to -1 was not such a valid way to do so (and also, this
didn't play nicely with smoothview).
This feature should now work correctly, though there are still one or two
places where it doesn't always seem totally correct yet.
The basic idea of this feature, is that after going into camera mode (Pad0),
pressing Pad0 again lets you go back to the view as you had it before entering
camera mode.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/src/space.c
trunk/blender/source/blender/src/toets.c
trunk/blender/source/blender/src/view.c
Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h2008-09-29
08:00:38 UTC (rev 16815)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h2008-09-29
08:11:26 UTC (rev 16816)
@@ -147,8 +147,9 @@
/* last view */
float lviewquat[4];
- short lpersp, pad4;
- int pad5;
+ short lpersp, lview;
+ short lastview_set;
+ short pad5;
} View3D;
Modified: trunk/blender/source/blender/src/space.c
===
--- trunk/blender/source/blender/src/space.c2008-09-29 08:00:38 UTC (rev
16815)
+++ trunk/blender/source/blender/src/space.c2008-09-29 08:11:26 UTC (rev
16816)
@@ -1709,7 +1709,6 @@
break;
case MIDDLEMOUSE:
handle_view_middlemouse();
- G.vd->view = -1;
break;
case RIGHTMOUSE:
if((G.obedit) && (G.qual & LR_CTRLKEY)==0) {
Modified: trunk/blender/source/blender/src/toets.c
===
--- trunk/blender/source/blender/src/toets.c2008-09-29 08:00:38 UTC (rev
16815)
+++ trunk/blender/source/blender/src/toets.c2008-09-29 08:11:26 UTC (rev
16816)
@@ -289,9 +289,22 @@
if(G.vd->persp==V3D_PERSP)
G.vd->persp=V3D_ORTHO;
else G.vd->persp=V3D_PERSP;
}
- G.vd->lpersp = G.vd->persp;
}
else if(event==PAD0) {
+ /* lastview - */
+ if(G.vd->lastview_set==0) {
+ /* store settings of current view before
allowing overwriting with camera view */
+ QUATCOPY(G.vd->lviewquat, G.vd->viewquat);
+ G.vd->lview= G.vd->view;
+ G.vd->lpersp= G.vd->persp;
+ G.vd->lastview_set= 1;
+ }
+ else if(G.vd->lastview_set) {
+ /* return to settings of last view */
+ axis_set_view(G.vd->lviewquat[0],
G.vd->lviewquat[1], G.vd->lviewquat[2], G.vd->lviewquat[3], G.vd->lview,
G.vd->lpersp);
+ G.vd->lastview_set= 0;
+ }
+
if(G.qual==LR_ALTKEY) {
if(oldcamera && is_an_active_object(oldcamera))
{
G.vd->camera= oldcamera;
@@ -314,18 +327,12 @@
handle_view3d_lock();
}
}
+
if(G.vd->camera==0) {
G.vd->camera= scene_find_camera(G.scene);
handle_view3d_lock();
}
- if(!G.vd->view) {
- QUATCOPY(G.vd->viewquat, G.vd->lviewquat);
- G.vd->persp = G.vd->lpersp;
- }
- else {
- QUATCOPY(G.vd->lviewquat, G.vd->viewquat);
- G.vd->lpersp = G.vd->persp;
- }
+
if(G.vd->camera && (G.vd->camera != act_cam_orig)) {
G.vd->persp= V3D_CAMOB;
G.vd->view= 0;
@@ -350,8 +357,6 @@
VECCOPY(G.vd->ofs, orig_ofs);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16815] trunk/blender/source/gameengine/ Physics/Bullet/CcdPhysicsEnvironment.cpp: don' t crash when trying to make a soft body 'fh' object
Revision: 16815
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16815
Author: erwin
Date: 2008-09-29 10:00:38 +0200 (Mon, 29 Sep 2008)
Log Message:
---
don't crash when trying to make a soft body 'fh' object
Modified Paths:
--
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Modified:
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
2008-09-29 07:56:41 UTC (rev 16814)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
2008-09-29 08:00:38 UTC (rev 16815)
@@ -626,13 +626,15 @@
for (it=m_controllers.begin(); it!=m_controllers.end(); it++)
{
CcdPhysicsController* ctrl = (*it);
- if (ctrl->GetRigidBody() && ctrl->getConstructionInfo().m_do_fh
|| ctrl->getConstructionInfo().m_do_rot_fh)
+ btRigidBody* body = ctrl->GetRigidBody();
+
+ if (body && (ctrl->getConstructionInfo().m_do_fh ||
ctrl->getConstructionInfo().m_do_rot_fh))
{
//printf("has Fh or RotFh\n");
//re-implement SM_FhObject.cpp using
btCollisionWorld::rayTest and info from ctrl->getConstructionInfo()
//send a ray from {0.0, 0.0, 0.0} towards {0.0, 0.0,
-10.0}, in local coordinates
- btRigidBody* body = ctrl->GetRigidBody();
+
CcdPhysicsController* parentCtrl =
ctrl->getParentCtrl();
btRigidBody* parentBody =
parentCtrl?parentCtrl->GetRigidBody() : 0;
btRigidBody* cl_object = parentBody ? parentBody : body;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16814] branches/sim_physics/source/ blender: * New Point Density texture option: 'Object Vertices'
Revision: 16814
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16814
Author: broken
Date: 2008-09-29 09:56:41 +0200 (Mon, 29 Sep 2008)
Log Message:
---
* New Point Density texture option: 'Object Vertices'
This works very similarly to particles, it just uses the object's renderable
vertices as the points instead.
http://mke3.net/blender/devel/rendering/volumetrics/pd_objectvertices.png
Modified Paths:
--
branches/sim_physics/source/blender/makesdna/DNA_texture_types.h
branches/sim_physics/source/blender/render/intern/source/pointdensity.c
branches/sim_physics/source/blender/src/buttons_shading.c
Modified: branches/sim_physics/source/blender/makesdna/DNA_texture_types.h
===
--- branches/sim_physics/source/blender/makesdna/DNA_texture_types.h
2008-09-29 07:17:12 UTC (rev 16813)
+++ branches/sim_physics/source/blender/makesdna/DNA_texture_types.h
2008-09-29 07:56:41 UTC (rev 16814)
@@ -136,12 +136,14 @@
short source;
short pdpad[3];
- struct Object *object; /* for 'Particle system' type - source object */
- short psysindex;/* and object's psys number */
- short psys_cache_space; /* cache particles in worldspace, object space,
... ? */
+ struct Object *object; /* for 'Object' or 'Particle system' type -
source object */
+ short psys_cache_space; /* cache points in worldspace, object
space, ... ? */
+ short psysindex;/* for 'Particle system' type -
object's psys number */
- short pdpad2[2];
+ short ob_cache_space; /* cache points in worldspace, object
space, ... ? */
+ short pdpad2;
+
void *point_tree; /* the kd-tree containing points */
} PointDensity;
@@ -414,9 +416,9 @@
#define TEX_PD_FILE2
/* psys_cache_space */
-#define TEX_PD_PSYS_OBJECTLOC 0
-#define TEX_PD_PSYS_OBJECTSPACE1
-#define TEX_PD_PSYS_WORLDSPACE 2
+#define TEX_PD_OBJECTLOC 0
+#define TEX_PD_OBJECTSPACE 1
+#define TEX_PD_WORLDSPACE 2
#endif
Modified:
branches/sim_physics/source/blender/render/intern/source/pointdensity.c
===
--- branches/sim_physics/source/blender/render/intern/source/pointdensity.c
2008-09-29 07:17:12 UTC (rev 16813)
+++ branches/sim_physics/source/blender/render/intern/source/pointdensity.c
2008-09-29 07:56:41 UTC (rev 16814)
@@ -39,6 +39,7 @@
#include "DNA_particle_types.h"
#include "render_types.h"
+#include "renderdatabase.h"
#include "texture.h"
@@ -54,7 +55,6 @@
/* init crap */
if (!psys || !ob || !pd) return;
- //Mat4CpyMat4(obview, ob->obmat);
Mat4MulMat4(obview, re->viewinv, ob->obmat);
/* Just to create a valid rendering context */
@@ -71,7 +71,6 @@
/* in case ob->imat isn't up-to-date */
Mat4Invert(ob->imat, ob->obmat);
- /* finally do something */
pd->point_tree = BLI_kdtree_new(psys->totpart+psys->totchild);
if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
@@ -84,17 +83,17 @@
VECCOPY(partco, state.co);
- if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTSPACE)
+ if (pd->psys_cache_space == TEX_PD_OBJECTSPACE)
Mat4MulVecfl(ob->imat, partco);
- else if (pd->psys_cache_space == TEX_PD_PSYS_OBJECTLOC)
{
+ else if (pd->psys_cache_space == TEX_PD_OBJECTLOC) {
float obloc[3];
VECCOPY(obloc, ob->loc);
VecSubf(partco, partco, obloc);
} else {
- /* TEX_PD_PSYS_WORLDSPACE */
+ /* TEX_PD_WORLDSPACE */
}
- BLI_kdtree_insert(pd->point_tree, 0, partco, NULL);
+ BLI_kdtree_insert(pd->point_tree, i, partco, NULL);
}
}
@@ -103,6 +102,38 @@
}
+static void pointdensity_cache_object(Render *re, PointDensity *pd, ObjectRen
*obr)
+{
+ int i;
+
+ if (!obr || !pd) return;
+ if(!obr->vertnodes) return;
+
+ /* in case ob->imat isn't up-to-date */
+ Mat4Invert(obr->ob->imat, obr->ob->obmat);
+
+ pd->point_tree = BLI_kdtree_new(obr->totvert);
+
+ for(i=0; itotvert; i++) {
+ float ver_co[3];
+ VertRen *ver= RE_findOrAddVert(obr, i);
+
+ VECCOPY(ver_co, ver->co);
+
+ if (pd->ob_cache_space == TE
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16813] trunk/blender/source/blender/src/ buttons_logic.c: Clarify that in Bullet, the 'radius' is used for both sphere bounds, but also for Fh/Rot F
Revision: 16813
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16813
Author: erwin
Date: 2008-09-29 09:17:12 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Clarify that in Bullet, the 'radius' is used for both sphere bounds, but also
for Fh/Rot Fh.
So even if other bound types are used (such as box etc), the radius will be
used for Fh/Rot Fh.
Modified Paths:
--
trunk/blender/source/blender/src/buttons_logic.c
Modified: trunk/blender/source/blender/src/buttons_logic.c
===
--- trunk/blender/source/blender/src/buttons_logic.c2008-09-29 06:58:49 UTC
(rev 16812)
+++ trunk/blender/source/blender/src/buttons_logic.c2008-09-29 07:17:12 UTC
(rev 16813)
@@ -3132,16 +3132,11 @@
if (!(ob->gameflag & OB_SOFT_BODY))
{
- if (!(ob->gameflag & OB_BOUNDS) ||
(ob->boundtype==OB_BOUND_SPHERE))
- {
- uiDefButF(block, NUM,
REDRAWVIEW3D, "Radius:", 140, 185, 130, 19,
+
+ uiDefButF(block, NUM, REDRAWVIEW3D,
"Radius:", 140, 185, 130, 19,
&ob->inertia,
0.01, 10.0, 10, 2,
- "Bounding
sphere radius");
- } else
- {
- uiBlockEndAlign(block);
- uiBlockBeginAlign(block);
- }
+ "Radius for
Bounding sphere and Fh/Fh Rot");
+
uiDefButBitI(block, TOG,
OB_COLLISION_RESPONSE, B_REDR, "No sleeping", 270,185,80,19,
&ob->gameflag, 0, 0, 0,
0,
"Disable auto
(de)activation");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16812] trunk/blender/source/gameengine: Add Fh/Rot Fh to Bullet.
Revision: 16812
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16812
Author: erwin
Date: 2008-09-29 08:58:49 +0200 (Mon, 29 Sep 2008)
Log Message:
---
Add Fh/Rot Fh to Bullet.
Modified Paths:
--
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Modified: trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
2008-09-29 04:43:51 UTC (rev 16811)
+++ trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
2008-09-29 06:58:49 UTC (rev 16812)
@@ -211,6 +211,9 @@
//parentcontroller is here be able to avoid collisions between
parent/child
PHY_IPhysicsController* parentctrl = NULL;
+ KX_BulletPhysicsController* parentKxCtrl = NULL;
+ CcdPhysicsController* ccdParent = NULL;
+
if (destnode != destnode->GetRootSGParent())
{
@@ -230,12 +233,15 @@
KX_GameObject *clientgameobj =
static_cast( (*childit)->GetSGClientObject());
if (clientgameobj)
{
- parentctrl =
(KX_BulletPhysicsController*)clientgameobj->GetPhysicsController();
+ parentKxCtrl =
(KX_BulletPhysicsController*)clientgameobj->GetPhysicsController();
+ parentctrl = parentKxCtrl;
+ ccdParent = parentKxCtrl;
}
}
}
}
+ physicsreplica->setParentCtrl(ccdParent);
physicsreplica->PostProcessReplica(motionstate,parentctrl);
physicsreplica->m_userdata = (PHY_IPhysicsController*)physicsreplica;
return physicsreplica;
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
===
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
2008-09-29 04:43:51 UTC (rev 16811)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
2008-09-29 06:58:49 UTC (rev 16812)
@@ -1028,12 +1028,18 @@
ci.m_do_anisotropic = shapeprops->m_do_anisotropic;
ci.m_anisotropicFriction.setValue(shapeprops->m_friction_scaling[0],shapeprops->m_friction_scaling[1],shapeprops->m_friction_scaling[2]);
- //smprop->m_do_fh = kxshapeprops->m_do_fh;
- //smprop->m_do_rot_fh = kxshapeprops->m_do_rot_fh ;
+//
+ //do Fh, do Rot Fh
+ ci.m_do_fh = shapeprops->m_do_fh;
+ ci.m_do_rot_fh = shapeprops->m_do_rot_fh ;
+ ci.m_fh_damping = smmaterial->m_fh_damping;
+ ci.m_fh_distance = smmaterial->m_fh_distance;
+ ci.m_fh_normal = smmaterial->m_fh_normal;
+ ci.m_fh_spring = smmaterial->m_fh_spring;
+ ci.m_radius = objprop->m_radius;
-
///
ci.m_gamesoftFlag = objprop->m_gamesoftFlag;
ci.m_soft_linStiff = objprop->m_soft_linStiff;
@@ -1098,6 +1104,10 @@
if (rbody && objprop->m_disableSleeping)
rbody->setActivationState(DISABLE_DEACTIVATION);
}
+
+ CcdPhysicsController* parentCtrl = objprop->m_dynamic_parent ?
(KX_BulletPhysicsController*)objprop->m_dynamic_parent->GetPhysicsController()
: 0;
+ physicscontroller->setParentCtrl(parentCtrl);
+
//Now done directly in ci.m_collisionFlags so that it propagates to
replica
//if (objprop->m_ghost)
Modified:
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2008-09-29 04:43:51 UTC (rev 16811)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2008-09-29 06:58:49 UTC (rev 16812)
@@ -54,7 +54,7 @@
m_newClientInfo = 0;
m_registerCount = 0;
m_softBodyTransformInitialized = false;
-
+ m_parentCtrl = 0;
// copy pointers locally to allow smart release
m_MotionState = ci.m_MotionState;
m_collisionShape = ci.m_collisionShape;
@@ -628,6 +628,7 @@
// controller replication
void CcdPhysicsController::PostProcessReplica(class
PHY_IMotionState* motionstate,class PHY_IPhysicsController* parentctrl)
{
