Revision: 14436
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14436
Author: campbellbarton
Date: 2008-04-16 10:48:49 +0200 (Wed, 16 Apr 2008)
Log Message:
-----------
replace magic numbers with constants for (G.vd->persp), view naming was also
using persp as a flag which worked but isnt correct.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/src/drawscene.c
trunk/blender/source/blender/src/drawview.c
trunk/blender/source/blender/src/edit.c
trunk/blender/source/blender/src/editparticle.c
trunk/blender/source/blender/src/editview.c
trunk/blender/source/blender/src/header_view3d.c
trunk/blender/source/blender/src/renderwin.c
trunk/blender/source/blender/src/space.c
trunk/blender/source/blender/src/toets.c
trunk/blender/source/blender/src/transform.c
trunk/blender/source/blender/src/transform_constraints.c
trunk/blender/source/blender/src/transform_conversions.c
trunk/blender/source/blender/src/transform_generics.c
trunk/blender/source/blender/src/view.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2008-04-16
07:33:54 UTC (rev 14435)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2008-04-16
08:48:49 UTC (rev 14436)
@@ -539,11 +539,11 @@
if(v3d->camera==ob) {
v3d->camera= NULL;
- if(v3d->persp>1) v3d->persp= 1;
+ if(v3d->persp==V3D_CAMOB)
v3d->persp= V3D_PERSP;
}
if(v3d->localvd &&
v3d->localvd->camera==ob ) {
v3d->localvd->camera= NULL;
- if(v3d->localvd->persp>1)
v3d->localvd->persp= 1;
+
if(v3d->localvd->persp==V3D_CAMOB) v3d->localvd->persp= V3D_PERSP;
}
}
else if(sl->spacetype==SPACE_IPO) {
Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2008-04-16
07:33:54 UTC (rev 14435)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2008-04-16
08:48:49 UTC (rev 14436)
@@ -84,11 +84,6 @@
float viewquat[4], dist, zfac, pad0; /* zfac is initgrabz() result */
- /**
- * 0 - ortho
- * 1 - do 3d perspective
- * 2 - use the camera
- */
short persp;
short view;
@@ -165,7 +160,6 @@
#define V3D_CLIPPING 16384
#define V3D_DRAW_CENTERS 32768
-
/* View3d->flag2 (short) */
#define V3D_OPP_DIRECTION_NAME 1
#define V3D_FLYMODE 2
@@ -181,9 +175,9 @@
/* View3d->persp */
-#define V3D_PERSP_ORTHO 0
-#define V3D_PERSP_DO_3D_PERSP 1
-#define V3D_PERSP_USE_THE_CAMERA 2
+#define V3D_ORTHO 0
+#define V3D_PERSP 1
+#define V3D_CAMOB 2
/* View3d->gridflag */
#define V3D_SHOW_FLOOR 1
Modified: trunk/blender/source/blender/src/drawscene.c
===================================================================
--- trunk/blender/source/blender/src/drawscene.c 2008-04-16 07:33:54 UTC
(rev 14435)
+++ trunk/blender/source/blender/src/drawscene.c 2008-04-16 08:48:49 UTC
(rev 14436)
@@ -111,7 +111,7 @@
if (!v3d->camera ||
!object_in_scene(v3d->camera, sce)) {
v3d->camera=
scene_find_camera(sc->scene);
if (sc==G.curscreen)
handle_view3d_lock();
- if (!v3d->camera &&
v3d->persp>1) v3d->persp= 1;
+ if (!v3d->camera &&
v3d->persp==V3D_CAMOB) v3d->persp= V3D_PERSP;
}
}
sl= sl->next;
Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c 2008-04-16 07:33:54 UTC (rev
14435)
+++ trunk/blender/source/blender/src/drawview.c 2008-04-16 08:48:49 UTC (rev
14436)
@@ -1508,25 +1508,25 @@
switch(G.vd->view) {
case 1:
- if (G.vd->persp & V3D_PERSP_DO_3D_PERSP)
+ if (G.vd->persp == V3D_ORTHO)
+ name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Back Ortho" : "Front Ortho";
+ else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Back Persp" : "Front Persp";
- else
- name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Back Ortho" : "Front Ortho";
break;
case 3:
- if (G.vd->persp & V3D_PERSP_DO_3D_PERSP)
+ if (G.vd->persp == V3D_ORTHO)
+ name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Left Ortho" : "Right Ortho";
+ else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Left Persp" : "Right Persp";
- else
- name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Left Ortho" : "Right Ortho";
break;
case 7:
- if (G.vd->persp & V3D_PERSP_DO_3D_PERSP)
+ if (G.vd->persp == V3D_ORTHO)
+ name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Bottom Ortho" : "Top Ortho";
+ else
name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Bottom Persp" : "Top Persp";
- else
- name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ?
"Bottom Ortho" : "Top Ortho";
break;
default:
- if (G.vd->persp==V3D_PERSP_USE_THE_CAMERA) {
+ if (G.vd->persp==V3D_CAMOB) {
if ((G.vd->camera) && (G.vd->camera->type ==
OB_CAMERA)) {
Camera *cam;
cam = G.vd->camera->data;
@@ -1535,7 +1535,7 @@
name = "Object as Camera";
}
} else {
- name = (G.vd->persp & V3D_PERSP_DO_3D_PERSP) ?
"User Persp" : "User Ortho";
+ name = (G.vd->persp == V3D_ORTHO) ? "User
Ortho" : "User Persp";
}
}
Modified: trunk/blender/source/blender/src/edit.c
===================================================================
--- trunk/blender/source/blender/src/edit.c 2008-04-16 07:33:54 UTC (rev
14435)
+++ trunk/blender/source/blender/src/edit.c 2008-04-16 08:48:49 UTC (rev
14436)
@@ -251,7 +251,7 @@
BIF_ThemeColor(TH_BACK);
glRecti(10, 25, 250, 40);
- if(G.vd->persp==0) {
+ if(G.vd->persp==V3D_ORTHO) {
window_to_3d(dvec, mvalo[0]-x1,
mvalo[1]-y1);
sprintf(str, "X %.4f Y %.4f Z
%.4f Dia %.4f", dvec[0], dvec[1], dvec[2],
sqrt(dvec[0]*dvec[0]+dvec[1]*dvec[1]+dvec[2]*dvec[2]));
@@ -262,7 +262,7 @@
glRasterPos2i(16, 28);
BMF_DrawString(G.fonts, str);
}
- else if(G.vd->persp==2) {
+ else if(G.vd->persp==V3D_CAMOB) {
rctf vb;
calc_viewborder(G.vd, &vb);
Modified: trunk/blender/source/blender/src/editparticle.c
===================================================================
--- trunk/blender/source/blender/src/editparticle.c 2008-04-16 07:33:54 UTC
(rev 14435)
+++ trunk/blender/source/blender/src/editparticle.c 2008-04-16 08:48:49 UTC
(rev 14436)
@@ -2307,7 +2307,7 @@
/* create intersection coordinates in view Z direction at mouse
coordinates */
/* Thanks to who ever wrote the "Mouse Location 3D Space"
tutorial in "Blender 3D: Blending Into Python/Cookbook". */
- if(G.vd->persp){
+ if(G.vd->persp != V3D_ORTHO){
vec[0]= (2.0f*(mx+dmx)/curarea->winx);
vec[1]= (2.0f*(my+dmy)/curarea->winy);
vec[2]= -1.0f;
Modified: trunk/blender/source/blender/src/editview.c
===================================================================
--- trunk/blender/source/blender/src/editview.c 2008-04-16 07:33:54 UTC (rev
14435)
+++ trunk/blender/source/blender/src/editview.c 2008-04-16 08:48:49 UTC (rev
14436)
@@ -2287,7 +2287,7 @@
cent[0] = (((double)rect.xmin)+((double)rect.xmax)) / 2;
cent[1] = (((double)rect.ymin)+((double)rect.ymax)) / 2;
- if (v3d->persp==1) { /* perspective */
+ if (v3d->persp==V3D_PERSP) {
double p_corner[3];
/* no depths to use, we cant do anything! */
@@ -2404,7 +2404,7 @@
if(curarea->spacetype!=SPACE_VIEW3D) return;
- if(G.vd->persp==2 && G.vd->camera->id.lib) {
+ if(G.vd->persp==V3D_CAMOB && G.vd->camera->id.lib) {
error("Cannot fly a camera from an external library");
return;
}
@@ -2425,7 +2425,7 @@
persp_backup= G.vd->persp;
dist_backup= G.vd->dist;
- if (G.vd->persp==2) { /* Camera */
+ if (G.vd->persp==V3D_CAMOB) {
if(G.vd->camera->constraints.first) {
error("Cannot fly an object with constraints");
return;
@@ -2448,8 +2448,8 @@
} else {
/* perspective or ortho */
- if (G.vd->persp==0)
- G.vd->persp= 1; /*if ortho projection, make perspective
*/
+ if (G.vd->persp==V3D_ORTHO)
+ G.vd->persp= V3D_PERSP; /*if ortho projection, make
perspective */
QUATCOPY(rot_backup, G.vd->viewquat);
VECCOPY(ofs_backup, G.vd->ofs);
G.vd->dist= 0.0;
@@ -2746,7 +2746,7 @@
dvec[2] = dvec_tmp[2]*(1-dvec_lag) +
dvec_old[2]*dvec_lag;
- if (G.vd->persp==2) {
+ if (G.vd->persp==V3D_CAMOB) {
if (G.vd->camera->protectflag & OB_LOCK_LOCX)
dvec[0] = 0.0;
if (G.vd->camera->protectflag & OB_LOCK_LOCY)
@@ -2768,11 +2768,11 @@
do_screenhandlers(G.curscreen); /* advance the next
frame */
/* we are in camera view so apply the view ofs and quat
to the view matrix and set the camera to teh view */
- if (G.vd->persp==2) {
- G.vd->persp= 1; /*set this so
setviewmatrixview3d uses the ofs and quat instead of the camera */
+ if (G.vd->persp==V3D_CAMOB) {
+ G.vd->persp= V3D_PERSP; /*set this so
setviewmatrixview3d uses the ofs and quat instead of the camera */
setviewmatrixview3d();
setcameratoview3d();
- G.vd->persp= 2;
+ G.vd->persp= V3D_CAMOB;
/* record the motion */
if (IS_AUTOKEY_MODE(NORMAL) && (!playing_anim
|| cfra != G.scene->r.cfra)) {
@@ -2803,7 +2803,7 @@
/* Revert to original view? */
if (action == 2) { /* action == 2 means the user pressed Esc of RMB,
and not to apply view to camera */
- if (persp_backup==2) { /* a camera view */
+ if (persp_backup==V3D_CAMOB) { /* a camera view */
G.vd->viewbut=1;
VECCOPY(G.vd->camera->loc, ofs_backup);
VECCOPY(G.vd->camera->rot, rot_backup);
@@ -2815,7 +2815,7 @@
G.vd->persp= persp_backup;
}
}
- else if (persp_backup==2) { /* camera */
+ else if (persp_backup==V3D_CAMOB) { /* camera */
float mat3[3][3];
Mat3CpyMat4(mat3, G.vd->camera->obmat);
Mat3ToCompatibleEul(mat3, G.vd->camera->rot, rot_backup);
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2008-04-16 07:33:54 UTC
(rev 14435)
+++ trunk/blender/source/blender/src/header_view3d.c 2008-04-16 08:48:49 UTC
(rev 14436)
@@ -220,7 +220,7 @@
if (event==i) {
- if (G.vd->camera == base->object &&
G.vd->persp==2)
+ if (G.vd->camera == base->object &&
G.vd->persp==V3D_CAMOB)
return;
if (U.smooth_viewtx) {
@@ -228,12 +228,12 @@
float orig_ofs[3], orig_lens =
G.vd->lens;
VECCOPY(orig_ofs, G.vd->ofs);
- if (G.vd->camera &&
G.vd->persp==2)
+ if (G.vd->camera &&
G.vd->persp==V3D_CAMOB)
view_settings_from_ob(G.vd->camera, G.vd->ofs, G.vd->viewquat, &G.vd->dist,
&G.vd->lens);
G.vd->camera = base->object;
handle_view3d_lock();
- G.vd->persp= 2;
+ G.vd->persp= V3D_CAMOB;
G.vd->view= 0;
smooth_view_to_camera(G.vd);
@@ -244,7 +244,7 @@
} else {
G.vd->camera= base->object;
handle_view3d_lock();
- G.vd->persp= 2;
+ G.vd->persp= V3D_CAMOB;
G.vd->view= 0;
}
break;
@@ -550,7 +550,7 @@
switch(event) {
case 0: /* User */
G.vd->viewbut = 0;
- G.vd->persp = 1;
+ G.vd->persp = V3D_PERSP;
break;
case 1: /* Camera */
persptoetsen(PAD0);
@@ -565,10 +565,10 @@
persptoetsen(PAD3);
break;
case 5: /* Perspective */
- G.vd->persp=1;
+ G.vd->persp=V3D_PERSP;
break;
case 6: /* Orthographic */
- G.vd->persp=0;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
