Revision: 19440
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19440
Author: dfelinto
Date: 2009-03-29 01:34:56 +0100 (Sun, 29 Mar 2009)
Log Message:
-----------
merge from trunk +
- Dome images > 180 optimized to use more of the tesselated mesh
- Bug fixed (scaled texture maps)
- clean up (no more OFFSET and WARPED mode)
- I guess it's ready for review
Modified Paths:
--------------
branches/ge_dome/source/blender/blenkernel/BKE_curve.h
branches/ge_dome/source/blender/blenkernel/intern/anim.c
branches/ge_dome/source/blender/blenkernel/intern/curve.c
branches/ge_dome/source/blender/python/api2_2x/CurNurb.c
branches/ge_dome/source/blender/python/api2_2x/SurfNurb.c
branches/ge_dome/source/blender/src/buttons_editing.c
branches/ge_dome/source/blender/src/drawobject.c
branches/ge_dome/source/blender/src/drawview.c
branches/ge_dome/source/blender/src/editcurve.c
branches/ge_dome/source/blender/src/editobject.c
branches/ge_dome/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h
branches/ge_dome/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_GameActuator.h
branches/ge_dome/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/ge_dome/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_SceneActuator.h
branches/ge_dome/source/gameengine/PyDoc/KX_GameActuator.py
branches/ge_dome/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/ge_dome/source/gameengine/PyDoc/KX_SceneActuator.py
branches/ge_dome/source/nan_definitions.mk
Modified: branches/ge_dome/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/ge_dome/source/blender/blenkernel/BKE_curve.h 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/blenkernel/BKE_curve.h 2009-03-29
00:34:56 UTC (rev 19440)
@@ -63,7 +63,7 @@
void test2DNurb( struct Nurb *nu);
void minmaxNurb( struct Nurb *nu, float *min, float *max);
-void makeknots( struct Nurb *nu, short uv, short type);
+void makeknots( struct Nurb *nu, short uv);
void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array,
float *radius_array, int resolu);
Modified: branches/ge_dome/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/ge_dome/source/blender/blenkernel/intern/anim.c 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/blenkernel/intern/anim.c 2009-03-29
00:34:56 UTC (rev 19440)
@@ -223,14 +223,16 @@
cu= ob->data;
if(cu->path==NULL || cu->path->data==NULL) {
printf("no path!\n");
+ return 0;
}
path= cu->path;
fp= path->data;
/* test for cyclic */
bl= cu->bev.first;
+ if (!bl) return 0;
if (!bl->nr) return 0;
- if(bl && bl->poly> -1) cycl= 1;
+ if(bl->poly> -1) cycl= 1;
ctime *= (path->len-1);
Modified: branches/ge_dome/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/ge_dome/source/blender/blenkernel/intern/curve.c 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/blenkernel/intern/curve.c 2009-03-29
00:34:56 UTC (rev 19440)
@@ -554,8 +554,8 @@
}
-/* type - 0: uniform, 1: endpoints, 2: bezier, note, cyclic nurbs are always
uniform */
-void makeknots(Nurb *nu, short uv, short type)
+
+void makeknots(Nurb *nu, short uv)
{
if( (nu->type & 7)==CU_NURBS ) {
if(uv == 1) {
@@ -566,7 +566,7 @@
calcknots(nu->knotsu, nu->pntsu,
nu->orderu, 0); /* cyclic should be uniform */
makecyclicknots(nu->knotsu, nu->pntsu,
nu->orderu);
} else {
- calcknots(nu->knotsu, nu->pntsu,
nu->orderu, type);
+ calcknots(nu->knotsu, nu->pntsu,
nu->orderu, nu->flagu>>1);
}
}
else nu->knotsu= NULL;
@@ -579,7 +579,7 @@
calcknots(nu->knotsv, nu->pntsv,
nu->orderv, 0); /* cyclic should be uniform */
makecyclicknots(nu->knotsv, nu->pntsv,
nu->orderv);
} else {
- calcknots(nu->knotsv, nu->pntsv,
nu->orderv, type);
+ calcknots(nu->knotsv, nu->pntsv,
nu->orderv, nu->flagv>>1);
}
}
else nu->knotsv= NULL;
@@ -2333,7 +2333,7 @@
if(code==1 || code==2) {
nu= editNurb.first;
while(nu) {
- if( (nu->type & 7)==1) {
+ if( (nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
@@ -2363,7 +2363,7 @@
} else {
/* Toggle */
while(nu) {
- if( (nu->type & 7)==1) {
+ if( (nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
@@ -2380,7 +2380,7 @@
}
nu= editNurb.first;
while(nu) {
- if( (nu->type & 7)==1) {
+ if( (nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
Modified: branches/ge_dome/source/blender/python/api2_2x/CurNurb.c
===================================================================
--- branches/ge_dome/source/blender/python/api2_2x/CurNurb.c 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/python/api2_2x/CurNurb.c 2009-03-29
00:34:56 UTC (rev 19440)
@@ -564,7 +564,7 @@
tmp->radius = radius;
tmp->weight = 0.0; /* softbody weight TODO - add access to
this, is zero elsewhere but through blender is 1.0 by default */
- makeknots( nurb, 1, nurb->flagu >> 1 );
+ makeknots(nurb, 1);
} else {
/* bail with error */
@@ -649,7 +649,7 @@
if( self->nurb->flagu != value ) {
self->nurb->flagu = (short)value;
- makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+ makeknots(self->nurb, 1);
}
return 0;
@@ -698,7 +698,7 @@
if( self->nurb->flagv != value ) {
self->nurb->flagv = (short)value;
- makeknots( self->nurb, 2, self->nurb->flagv >> 1 );
+ makeknots( self->nurb, 2);
}
return 0;
@@ -728,7 +728,7 @@
order = self->nurb->pntsu;
self->nurb->orderu = (short)order;
- makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+ makeknots(self->nurb, 1);
return 0;
}
Modified: branches/ge_dome/source/blender/python/api2_2x/SurfNurb.c
===================================================================
--- branches/ge_dome/source/blender/python/api2_2x/SurfNurb.c 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/python/api2_2x/SurfNurb.c 2009-03-29
00:34:56 UTC (rev 19440)
@@ -195,7 +195,7 @@
nurb->bp[npoints].alfa = 0.0f;
}
- makeknots( nurb, 1, nurb->flagu >> 1 );
+ makeknots(nurb, 1);
} else {
return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -322,7 +322,7 @@
flagu = (flagu << 1) | (self->nurb->flagu & CU_CYCLIC);
if( self->nurb->flagu != flagu ) {
self->nurb->flagu = (short)flagu;
- makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+ makeknots(self->nurb, 1);
}
return 0;
@@ -366,7 +366,7 @@
flagv = (flagv << 1) | (self->nurb->flagv & CU_CYCLIC);
if( self->nurb->flagv != flagv ) {
self->nurb->flagv = (short)flagv;
- makeknots( self->nurb, 2, self->nurb->flagv >> 1 );
+ makeknots(self->nurb, 2);
}
return 0;
@@ -402,7 +402,7 @@
order = self->nurb->pntsu;
self->nurb->orderu = (short)order;
- makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+ makeknots(self->nurb, 1);
return 0;
}
@@ -431,7 +431,7 @@
order = self->nurb->pntsv;
self->nurb->orderv = (short)order;
- makeknots( self->nurb, 2, self->nurb->flagv >> 1 );
+ makeknots(self->nurb, 2);
return 0;
}
@@ -467,7 +467,7 @@
self->nurb->flagu |= CU_CYCLIC;
else
self->nurb->flagu &= ~CU_CYCLIC;
- makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+ makeknots(self->nurb, 1);
return 0;
}
@@ -482,7 +482,7 @@
self->nurb->flagv |= CU_CYCLIC;
else
self->nurb->flagv &= ~CU_CYCLIC;
- makeknots( self->nurb, 2, self->nurb->flagv >> 1 );
+ makeknots(self->nurb, 2);
return 0;
}
Modified: branches/ge_dome/source/blender/src/buttons_editing.c
===================================================================
--- branches/ge_dome/source/blender/src/buttons_editing.c 2009-03-28
22:01:07 UTC (rev 19439)
+++ branches/ge_dome/source/blender/src/buttons_editing.c 2009-03-29
00:34:56 UTC (rev 19440)
@@ -3311,13 +3311,13 @@
nu->flagu &= CU_CYCLIC;
/* disable all flags except for CU_CYCLIC */
nu->flagu |=
((event-B_UNIFU)<<1);
clamp_nurb_order_u(nu);
- makeknots(nu, 1,
nu->flagu>>1);
+ makeknots(nu, 1);
}
else if(nu->pntsv>1) {
nu->flagv &= CU_CYCLIC;
/* disable all flags except for CU_CYCLIC */
nu->flagv |=
((event-B_UNIFV)<<1);
clamp_nurb_order_v(nu);
- makeknots(nu, 2,
nu->flagv>>1);
+ makeknots(nu, 2);
}
}
}
@@ -3359,11 +3359,11 @@
if(clamp_nurb_order_u(nu)) {
scrarea_queue_winredraw(curarea);
}
- makeknots(nu, 1, nu->flagu>>1);
+ makeknots(nu, 1);
if(clamp_nurb_order_v(nu)) {
scrarea_queue_winredraw(curarea);
}
- makeknots(nu, 2, nu->flagv>>1);
+ makeknots(nu, 2);
}
BIF_undo_push("Make knots");
DAG_object_flush_update(G.scene, G.obedit,
OB_RECALC_DATA);
@@ -3527,12 +3527,12 @@
450,90,72, 18, 0, 0, 0, 0, 0, "");
/* KEY_LINEAR, KEY_CARDINAL, KEY_BSPLINE */
uiDefButS(block, MENU, B_TILTINTERP, "Tilt
Interpolation %t|Linear%x0|Cardinal%x1|BSpline %x2|Ease%x3",
- 495,90,66, 18, &(nu->tilt_interp), 0,
0, 0, 0, "Tadius interpolation for 3D curves");
+ 495,90,66, 18, &(nu->tilt_interp), 0,
0, 0, 0, "Tilt interpolation for 3D, bezier curves");
uiDefBut(block, LABEL, 0, "Radius",
450,70,72, 18, 0, 0, 0, 0, 0, "");
uiDefButS(block, MENU, B_TILTINTERP, "Radius
Interpolation %t|Linear%x0|Cardinal%x1|BSpline %x2|Ease%x3",
- 495,70,66, 18, &(nu->radius_interp), 0,
0, 0, 0, "Radius interpolation");
+ 495,70,66, 18, &(nu->radius_interp), 0,
0, 0, 0, "Radius interpolation for bezier curves");
}
uiBlockBeginAlign(block);
Modified: branches/ge_dome/source/blender/src/drawobject.c
===================================================================
--- branches/ge_dome/source/blender/src/drawobject.c 2009-03-28 22:01:07 UTC
(rev 19439)
+++ branches/ge_dome/source/blender/src/drawobject.c 2009-03-29 00:34:56 UTC
(rev 19440)
@@ -3777,7 +3777,7 @@
glBegin(GL_LINES);
- if( (nu->type & 7)==1) {
+ if( (nu->type & 7)==CU_BEZIER) {
if(sel) col= nurbcol+4;
else col= nurbcol;
@@ -3834,7 +3834,7 @@
bglBegin(GL_POINTS);
- if((nu->type & 7)==1) {
+ if((nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
Modified: branches/ge_dome/source/blender/src/drawview.c
===================================================================
--- branches/ge_dome/source/blender/src/drawview.c 2009-03-28 22:01:07 UTC
(rev 19439)
+++ branches/ge_dome/source/blender/src/drawview.c 2009-03-29 00:34:56 UTC
(rev 19440)
@@ -1773,7 +1773,7 @@
nu= editNurb.first;
while(nu) {
- if((nu->type & 7)==1) {
+ if((nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
Modified: branches/ge_dome/source/blender/src/editcurve.c
===================================================================
--- branches/ge_dome/source/blender/src/editcurve.c 2009-03-28 22:01:07 UTC
(rev 19439)
+++ branches/ge_dome/source/blender/src/editcurve.c 2009-03-29 00:34:56 UTC
(rev 19440)
@@ -691,7 +691,7 @@
nu->bp= newbp;
clamp_nurb_order_v(nu);
- makeknots(nu, 2, nu->flagv>>1);
+ makeknots(nu, 2);
}
else {
/* is the nurb in V direction selected */
@@ -737,7 +737,7 @@
nu->pntsu= newu;
clamp_nurb_order_u(nu);
}
- makeknots(nu, 1, nu->flagu>>1);
+ makeknots(nu, 1);
}
}
}
@@ -785,7 +785,7 @@
nu->pntsv= 2;
nu->orderv= 2;
- makeknots(nu, 2, nu->flagv>>1);
+ makeknots(nu, 2);
}
}
else {
@@ -828,7 +828,7 @@
MEM_freeN(nu->bp);
nu->bp= newbp;
nu->pntsv++;
- makeknots(nu, 2, nu->flagv>>1);
+ makeknots(nu, 2);
}
else if(v==0 || v== nu->pntsu-1) { /*
collumn in v-direction selected */
ok= 1;
@@ -855,7 +855,7 @@
MEM_freeN(nu->bp);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
