2.5

Drawing and viewing code for view3d back (no not objects :).

Quick test: converted 2250 ugly lines of code in 2.5 hours.
With about 300k lines todo, this will be 333 hours = 30 days? Whoa!

source/blender/editors/include/ED_util.h

@@ -33,6 +33,11 @@
 #define XIC 20
 #define YIC 20
 
+/* proposal = put scene pointers on function calls? */
+#define BASACT                    (scene->basact)
+#define OBACT                     (BASACT? BASACT->object: 0)
+
+
 void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert);
 int GetButStringLength(char *str);
 

source/blender/editors/space_view3d/Makefile

@@ -38,6 +38,8 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 
+CPPFLAGS += -I$(NAN_BMFONT)/include
+
 # not very neat....
 CPPFLAGS += -I../../windowmanager
 CPPFLAGS += -I../../blenloader
@@ -46,6 +48,7 @@ CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../makesdna
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../python
+CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
 # own include 

source/blender/editors/space_view3d/SConscript

@@ -5,5 +5,6 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
+incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont'
 
 env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )

source/blender/editors/space_view3d/space_view3d.c

@@ -189,17 +189,10 @@ void view3d_keymap(struct wmWindowManager *wm)
 static void view3d_main_area_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
-	float col[3], fac;
+	ScrArea *sa= CTX_wm_area(C);
+	View3D *v3d= sa->spacedata.first;	/* XXX get from region */
 	
-	/* clear and setup matrix */
-	UI_GetThemeColor3fv(TH_BACK, col);
-	glClearColor(col[0], col[1], col[2], 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	/* swapbuffers indicator */
-	fac= BLI_frand();
-	glColor3f(fac, fac, fac);
-	glRecti(20,  2,  30,  12);
+	drawview3dspace(C, ar, v3d);
 }
 
 

source/blender/editors/space_view3d/view3d_intern.h

@@ -38,9 +38,40 @@ typedef struct ViewDepths {
 	char damaged;
 } ViewDepths;
 
+/* drawing flags: */
+#define DRAW_PICKING	1
+#define DRAW_CONSTCOLOR	2
+#define DRAW_SCENESET	4
+
+/* project short */
+#define IS_CLIPPED        12000
+
 /* view3d_header.c */
 void view3d_header_buttons(const bContext *C, ARegion *ar);
 
+/* view3d_draw.c */
+void drawview3dspace(const bContext *C, ARegion *ar, View3D *v3d);
+int view3d_test_clipping(View3D *v3d, float *vec);
+void circf(float x, float y, float rad);
+void circ(float x, float y, float rad);
+void view3d_update_depths(ARegion *ar, View3D *v3d);
+
+/* view3d_view.c */
+float *give_cursor(Scene *scene, View3D *v3d);
+void initgrabz(View3D *v3d, float x, float y, float z);
+void window_to_3d(ARegion *ar, View3D *v3d, float *vec, short mx, short my);
+void view3d_project_float(ARegion *a, float *vec, float *adr, float mat[4][4]);
+void project_short(ARegion *ar, View3D *v3d, float *vec, short *adr);
+void project_int(ARegion *ar, View3D *v3d, float *vec, int *adr);
+void project_int_noclip(ARegion *ar, View3D *v3d, float *vec, int *adr);
+void project_short_noclip(ARegion *ar, View3D *v3d, float *vec, short *adr);
+void project_float(ARegion *ar, View3D *v3d, float *vec, float *adr);
+void project_float_noclip(ARegion *ar, View3D *v3d, float *vec, float *adr);
+int get_view3d_viewplane(View3D *v3d, int winxi, int winyi, rctf *viewplane, float *clipsta, float *clipend, float *pixsize);
+
+
+void setwinmatrixview3d(wmWindow *win, View3D *v3d, int winx, int winy, rctf *rect);	/* rect: for picking */
+void setviewmatrixview3d(View3D *v3d);
 
 #endif /* ED_VIEW3D_INTERN_H */
 

source/blender/editors/space_view3d/view3d_view.c

@@ -0,0 +1,714 @@
+/**
+ * $Id:
+ *
+ * ***** 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <float.h>
+
+#include "DNA_action_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_object_types.h"
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_rand.h"
+
+#include "BKE_action.h"
+#include "BKE_context.h"
+#include "BKE_object.h"
+#include "BKE_global.h"
+#include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_utildefines.h"
+
+#include "RE_pipeline.h"	// make_stars
+
+#include "BIF_gl.h"
+
+#include "WM_api.h"
+
+#include "ED_screen.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "PIL_time.h" /* smoothview */
+
+#include "view3d_intern.h"	// own include
+
+
+float *give_cursor(Scene *scene, View3D *v3d)
+{
+	if(v3d && v3d->localview) return v3d->cursor;
+	else return scene->cursor;
+}
+
+
+
+void initgrabz(View3D *v3d, float x, float y, float z)
+{
+	if(v3d==NULL) return;
+	v3d->zfac= v3d->persmat[0][3]*x+ v3d->persmat[1][3]*y+ v3d->persmat[2][3]*z+ v3d->persmat[3][3];
+	
+	/* if x,y,z is exactly the viewport offset, zfac is 0 and we don't want that 
+		* (accounting for near zero values)
+		* */
+	if (v3d->zfac < 1.e-6f && v3d->zfac > -1.e-6f) v3d->zfac = 1.0f;
+	
+	/* Negative zfac means x, y, z was behind the camera (in perspective).
+		* This gives flipped directions, so revert back to ok default case.
+	*/
+	if (v3d->zfac < 0.0f) v3d->zfac = 1.0f;
+}
+
+void window_to_3d(ARegion *ar, View3D *v3d, float *vec, short mx, short my)
+{
+	/* always call initgrabz */
+	float dx, dy;
+	
+	dx= 2.0f*mx*v3d->zfac/ar->winx;
+	dy= 2.0f*my*v3d->zfac/ar->winy;
+	
+	vec[0]= (v3d->persinv[0][0]*dx + v3d->persinv[1][0]*dy);
+	vec[1]= (v3d->persinv[0][1]*dx + v3d->persinv[1][1]*dy);
+	vec[2]= (v3d->persinv[0][2]*dx + v3d->persinv[1][2]*dy);
+}
+
+void view3d_project_float(ARegion *ar, float *vec, float *adr, float mat[4][4])
+{
+	float vec4[4];
+	
+	adr[0]= IS_CLIPPED;
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(mat, vec4);
+	
+	if( vec4[3]>FLT_EPSILON ) {
+		adr[0] = (float)(ar->winx/2.0f)+(ar->winx/2.0f)*vec4[0]/vec4[3];	
+		adr[1] = (float)(ar->winy/2.0f)+(ar->winy/2.0f)*vec4[1]/vec4[3];
+	} else {
+		adr[0] = adr[1] = 0.0f;
+	}
+}
+
+
+#define BL_NEAR_CLIP 0.001
+
+void project_short(ARegion *ar, View3D *v3d, float *vec, short *adr)	/* clips */
+{
+	float fx, fy, vec4[4];
+	
+	adr[0]= IS_CLIPPED;
+	
+	if(v3d->flag & V3D_CLIPPING) {
+		if(view3d_test_clipping(v3d, vec))
+			return;
+	}
+	
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( vec4[3]>BL_NEAR_CLIP ) {	/* 0.001 is the NEAR clipping cutoff for picking */
+		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+		
+		if( fx>0 && fx<ar->winx) {
+			
+			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			
+			if(fy>0.0 && fy< (float)ar->winy) {
+				adr[0]= (short)floor(fx); 
+				adr[1]= (short)floor(fy);
+			}
+		}
+	}
+}
+
+void project_int(ARegion *ar, View3D *v3d, float *vec, int *adr)
+{
+	float fx, fy, vec4[4];
+	
+	adr[0]= (int)2140000000.0f;
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( vec4[3]>BL_NEAR_CLIP ) {	/* 0.001 is the NEAR clipping cutoff for picking */
+		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+		
+		if( fx>-2140000000.0f && fx<2140000000.0f) {
+			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			
+			if(fy>-2140000000.0f && fy<2140000000.0f) {
+				adr[0]= (int)floor(fx); 
+				adr[1]= (int)floor(fy);
+			}
+		}
+	}
+}
+
+void project_int_noclip(ARegion *ar, View3D *v3d, float *vec, int *adr)
+{
+	float fx, fy, vec4[4];
+	
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( fabs(vec4[3]) > BL_NEAR_CLIP ) {
+		fx = (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+		fy = (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+		
+		adr[0] = (int)floor(fx); 
+		adr[1] = (int)floor(fy);
+	}
+	else
+	{
+		adr[0] = ar->winx / 2;
+		adr[1] = ar->winy / 2;
+	}
+}
+
+void project_short_noclip(ARegion *ar, View3D *v3d, float *vec, short *adr)
+{
+	float fx, fy, vec4[4];
+	
+	adr[0]= IS_CLIPPED;
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( vec4[3]>BL_NEAR_CLIP ) {	/* 0.001 is the NEAR clipping cutoff for picking */
+		fx= (ar->winx/2)*(1 + vec4[0]/vec4[3]);
+		
+		if( fx>-32700 && fx<32700) {
+			
+			fy= (ar->winy/2)*(1 + vec4[1]/vec4[3]);
+			
+			if(fy>-32700.0 && fy<32700.0) {
+				adr[0]= (short)floor(fx); 
+				adr[1]= (short)floor(fy);
+			}
+		}
+	}
+}
+
+void project_float(ARegion *ar, View3D *v3d, float *vec, float *adr)
+{
+	float vec4[4];
+	
+	adr[0]= IS_CLIPPED;
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( vec4[3]>BL_NEAR_CLIP ) {
+		adr[0] = (float)(ar->winx/2.0)+(ar->winx/2.0)*vec4[0]/vec4[3];	
+		adr[1] = (float)(ar->winy/2.0)+(ar->winy/2.0)*vec4[1]/vec4[3];
+	}
+}
+
+void project_float_noclip(ARegion *ar, View3D *v3d, float *vec, float *adr)
+{
+	float vec4[4];
+	
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(v3d->persmat, vec4);
+	
+	if( fabs(vec4[3]) > BL_NEAR_CLIP ) {
+		adr[0] = (float)(ar->winx/2.0)+(ar->winx/2.0)*vec4[0]/vec4[3];	
+		adr[1] = (float)(ar->winy/2.0)+(ar->winy/2.0)*vec4[1]/vec4[3];
+	}
+	else
+	{
+		adr[0] = ar->winx / 2.0f;
+		adr[1] = ar->winy / 2.0f;
+	}
+}
+
+
+
+/* also exposed in previewrender.c */
+int get_view3d_viewplane(View3D *v3d, int winxi, int winyi, rctf *viewplane, float *clipsta, float *clipend, float *pixsize)
+{
+	Camera *cam=NULL;
+	float lens, fac, x1, y1, x2, y2;
+	float winx= (float)winxi, winy= (float)winyi;
+	int orth= 0;
+	
+	lens= v3d->lens;	
+	
+	*clipsta= v3d->near;
+	*clipend= v3d->far;
+	
+	if(v3d->persp==V3D_CAMOB) {
+		if(v3d->camera) {
+			if(v3d->camera->type==OB_LAMP ) {
+				Lamp *la;
+				
+				la= v3d->camera->data;
+				fac= cos( M_PI*la->spotsize/360.0);
+				
+				x1= saacos(fac);
+				lens= 16.0*fac/sin(x1);
+				
+				*clipsta= la->clipsta;
+				*clipend= la->clipend;
+			}
+			else if(v3d->camera->type==OB_CAMERA) {
+				cam= v3d->camera->data;
+				lens= cam->lens;
+				*clipsta= cam->clipsta;
+				*clipend= cam->clipend;
+			}
+		}
+	}
+	
+	if(v3d->persp==V3D_ORTHO) {
+		if(winx>winy) x1= -v3d->dist;
+		else x1= -winx*v3d->dist/winy;
+		x2= -x1;
+		
+		if(winx>winy) y1= -winy*v3d->dist/winx;
+		else y1= -v3d->dist;
+		y2= -y1;
+		
+		*clipend *= 0.5;	// otherwise too extreme low zbuffer quality
+		*clipsta= - *clipend;
+		orth= 1;
+	}
+	else {
+		/* fac for zoom, also used for camdx */
+		if(v3d->persp==V3D_CAMOB) {
+			fac= (1.41421+( (float)v3d->camzoom )/50.0);
+			fac*= fac;
+		}
+		else fac= 2.0;
+		
+		/* viewplane size depends... */
+		if(cam && cam->type==CAM_ORTHO) {
+			/* ortho_scale == 1 means exact 1 to 1 mapping */
+			float dfac= 2.0*cam->ortho_scale/fac;
+			
+			if(winx>winy) x1= -dfac;
+			else x1= -winx*dfac/winy;
+			x2= -x1;
+			
+			if(winx>winy) y1= -winy*dfac/winx;
+			else y1= -dfac;
+			y2= -y1;
+			orth= 1;
+		}
+		else {
+			float dfac;
+			
+			if(winx>winy) dfac= 64.0/(fac*winx*lens);
+			else dfac= 64.0/(fac*winy*lens);
+			
+			x1= - *clipsta * winx*dfac;
+			x2= -x1;
+			y1= - *clipsta * winy*dfac;
+			y2= -y1;
+			orth= 0;
+		}
+		/* cam view offset */
+		if(cam) {
+			float dx= 0.5*fac*v3d->camdx*(x2-x1);
+			float dy= 0.5*fac*v3d->camdy*(y2-y1);
+			x1+= dx;
+			x2+= dx;
+			y1+= dy;
+			y2+= dy;
+		}
+	}
+	
+	if(pixsize) {
+		float viewfac;
+		
+		if(orth) {
+			viewfac= (winx >= winy)? winx: winy;
+			*pixsize= 1.0f/viewfac;
+		}
+		else {
+			viewfac= (((winx >= winy)? winx: winy)*lens)/32.0;
+			*pixsize= *clipsta/viewfac;
+		}
+	}
+	
+	viewplane->xmin= x1;
+	viewplane->ymin= y1;
+	viewplane->xmax= x2;
+	viewplane->ymax= y2;
+	
+	return orth;
+}
+
+
+/* important to not set windows active in here, can be renderwin for example */
+void setwinmatrixview3d(wmWindow *win, View3D *v3d, int winx, int winy, rctf *rect)		/* rect: for picking */
+{
+	rctf viewplane;
+	float clipsta, clipend, x1, y1, x2, y2;
+	int orth;
+	
+	orth= get_view3d_viewplane(v3d, winx, winy, &viewplane, &clipsta, &clipend, NULL);
+	//	printf("%d %d %f %f %f %f %f %f\n", winx, winy, viewplane.xmin, viewplane.ymin, viewplane.xmax, viewplane.ymax, clipsta, clipend);
+	x1= viewplane.xmin;
+	y1= viewplane.ymin;
+	x2= viewplane.xmax;
+	y2= viewplane.ymax;
+	
+	if(rect) {		/* picking */
+		rect->xmin/= (float)winx;
+		rect->xmin= x1+rect->xmin*(x2-x1);
+		rect->ymin/= (float)winy;
+		rect->ymin= y1+rect->ymin*(y2-y1);
+		rect->xmax/= (float)winx;
+		rect->xmax= x1+rect->xmax*(x2-x1);
+		rect->ymax/= (float)winy;
+		rect->ymax= y1+rect->ymax*(y2-y1);
+		
+		if(orth) wmOrtho(win, rect->xmin, rect->xmax, rect->ymin, rect->ymax, -clipend, clipend);
+		else wmFrustum(win, rect->xmin, rect->xmax, rect->ymin, rect->ymax, clipsta, clipend);
+		
+	}
+	else {
+		if(orth) wmOrtho(win, x1, x2, y1, y2, clipsta, clipend);
+		else wmFrustum(win, x1, x2, y1, y2, clipsta, clipend);
+	}
+
+	/* not sure what this was for? (ton) */
+	glMatrixMode(GL_PROJECTION);
+	wmGetMatrix(win, v3d->winmat);
+	glMatrixMode(GL_MODELVIEW);
+}
+
+
+/* SMOOTHVIEW */
+void smooth_view(View3D *v3d, float *ofs, float *quat, float *dist, float *lens)
+{
+	/* View Animation enabled */
+	if (U.smooth_viewtx) {
+		int i;
+		char changed = 0;
+		float step = 0.0, step_inv;
+		float orig_dist;
+		float orig_lens;
+		float orig_quat[4];
+		float orig_ofs[3];
+		
+		double time_allowed, time_current, time_start;
+		
+		/* if there is no difference, return */
+		changed = 0; /* zero means no difference */
+		if (dist) {
+			if ((*dist) != v3d->dist)
+				changed = 1;
+		}
+		
+		if (lens) {
+			if ((*lens) != v3d->lens)
+				changed = 1;
+		}
+		
+		if (!changed && ofs) {
+			if ((ofs[0]!=v3d->ofs[0]) ||
+				(ofs[1]!=v3d->ofs[1]) ||
+				(ofs[2]!=v3d->ofs[2]) )
+				changed = 1;
+		}
+		
+		if (!changed && quat ) {
+			if ((quat[0]!=v3d->viewquat[0]) ||
+				(quat[1]!=v3d->viewquat[1]) ||
+				(quat[2]!=v3d->viewquat[2]) ||
+				(quat[3]!=v3d->viewquat[3]) )
+				changed = 1;
+		}
+		
+		/* The new view is different from the old one
+			* so animate the view */
+		if (changed) {
+			
+			/* store original values */
+			VECCOPY(orig_ofs,	v3d->ofs);
+			QUATCOPY(orig_quat,	v3d->viewquat);
+			orig_dist =			v3d->dist;
+			orig_lens =			v3d->lens;
+			
+			time_allowed= (float)U.smooth_viewtx / 1000.0;
+			time_current = time_start = PIL_check_seconds_timer();
+			
+			/* if this is view rotation only
+				* we can decrease the time allowed by
+				* the angle between quats 
+				* this means small rotations wont lag */
+			if (quat && !ofs && !dist) {
+			 	float vec1[3], vec2[3];
+			 	VECCOPY(vec1, quat);
+			 	VECCOPY(vec2, v3d->viewquat);
+			 	Normalize(vec1);
+			 	Normalize(vec2);
+			 	/* scale the time allowed by the rotation */
+			 	time_allowed *= NormalizedVecAngle2(vec1, vec2)/(M_PI/2); 
+			}
+			
+			while (time_start + time_allowed > time_current) {
+				
+				step =  (float)((time_current-time_start) / time_allowed);
+				
+				/* ease in/out */
+				if (step < 0.5)	step = (float)pow(step*2, 2)/2;
+				else			step = (float)1-(pow(2*(1-step),2)/2);
+				
+				step_inv = 1-step;
+				
+				if (ofs)
+					for (i=0; i<3; i++)
+						v3d->ofs[i] = ofs[i]*step + orig_ofs[i]*step_inv;
+				
+				
+				if (quat)
+					QuatInterpol(v3d->viewquat, orig_quat, quat, step);
+				
+				if (dist)
+					v3d->dist = ((*dist)*step) + (orig_dist*step_inv);
+				
+				if (lens)
+					v3d->lens = ((*lens)*step) + (orig_lens*step_inv);
+				
+				/*redraw the view*/
+//				scrarea_do_windraw(ar);
+//				screen_swapbuffers();
+				
+				time_current= PIL_check_seconds_timer();
+			}
+		}
+	}
+	
+	/* set these values even if animation is enabled because flaot
+	* error will make then not quite accurate */
+	if (ofs)
+		VECCOPY(v3d->ofs, ofs);
+	if (quat)
+		QUATCOPY(v3d->viewquat, quat);
+	if (dist)
+		v3d->dist = *dist;
+	if (lens)
+		v3d->lens = *lens;
+	
+}
+
+
+
+/* Gets the lens and clipping values from a camera of lamp type object */
+void object_view_settings(Object *ob, float *lens, float *clipsta, float *clipend)
+{	
+	if (!ob) return;
+	
+	if(ob->type==OB_LAMP ) {
+		Lamp *la = ob->data;
+		if (lens) {
+			float x1, fac;
+			fac= cos( M_PI*la->spotsize/360.0);
+			x1= saacos(fac);
+			*lens= 16.0*fac/sin(x1);
+		}
+		if (clipsta)	*clipsta= la->clipsta;
+		if (clipend)	*clipend= la->clipend;
+	}
+	else if(ob->type==OB_CAMERA) {
+		Camera *cam= ob->data;
+		if (lens)		*lens= cam->lens;
+		if (clipsta)	*clipsta= cam->clipsta;
+		if (clipend)	*clipend= cam->clipend;
+	}
+}
+
+
+/* Gets the view trasnformation from a camera
+* currently dosnt take camzoom into account
+* 
+* The dist is not modified for this function, if NULL its assimed zero
+* */
+void view_settings_from_ob(Object *ob, float *ofs, float *quat, float *dist, float *lens)
+{	
+	float bmat[4][4];
+	float imat[4][4];
+	float tmat[3][3];
+	
+	if (!ob) return;
+	
+	/* Offset */
+	if (ofs) {
+		where_is_object(ob);
+		VECCOPY(ofs, ob->obmat[3]);
+		VecMulf(ofs, -1.0f); /*flip the vector*/
+	}
+	
+	/* Quat */
+	if (quat) {
+		Mat4CpyMat4(bmat, ob->obmat);
+		Mat4Ortho(bmat);
+		Mat4Invert(imat, bmat);
+		Mat3CpyMat4(tmat, imat);
+		Mat3ToQuat(tmat, quat);
+	}
+	
+	if (dist) {
+		float vec[3];
+		Mat3CpyMat4(tmat, ob->obmat);
+		
+		vec[0]= vec[1] = 0.0;
+		vec[2]= -(*dist);
+		Mat3MulVecfl(tmat, vec);
+		VecSubf(ofs, ofs, vec);
+	}
+	
+	/* Lens */
+	if (lens)
+		object_view_settings(ob, lens, NULL, NULL);
+}
+
+
+void obmat_to_viewmat(View3D *v3d, Object *ob, short smooth)
+{
+	float bmat[4][4];
+	float tmat[3][3];
+	
+	v3d->view= 0; /* dont show the grid */
+	
+	Mat4CpyMat4(bmat, ob->obmat);
+	Mat4Ortho(bmat);
+	Mat4Invert(v3d->viewmat, bmat);
+	
+	/* view quat calculation, needed for add object */
+	Mat3CpyMat4(tmat, v3d->viewmat);
+	if (smooth) {
+		float new_quat[4];
+		if (v3d->persp==V3D_CAMOB && v3d->camera) {
+			/* were from a camera view */
+			
+			float orig_ofs[3];
+			float orig_dist= v3d->dist;
+			float orig_lens= v3d->lens;
+			VECCOPY(orig_ofs, v3d->ofs);
+			
+			/* Switch from camera view */
+			Mat3ToQuat(tmat, new_quat);
+			
+			v3d->persp=V3D_PERSP;
+			v3d->dist= 0.0;
+			
+			view_settings_from_ob(v3d->camera, v3d->ofs, NULL, NULL, &v3d->lens);
+			smooth_view(v3d, orig_ofs, new_quat, &orig_dist, &orig_lens);
+			
+			v3d->persp=V3D_CAMOB; /* just to be polite, not needed */
+			
+		} else {
+			Mat3ToQuat(tmat, new_quat);
+			smooth_view(v3d, NULL, new_quat, NULL, NULL);
+		}
+	} else {
+		Mat3ToQuat(tmat, v3d->viewquat);
+	}
+}
+
+/* dont set windows active in in here, is used by renderwin too */
+void setviewmatrixview3d(View3D *v3d)
+{
+	if(v3d->persp==V3D_CAMOB) {	    /* obs/camera */
+		if(v3d->camera) {
+			where_is_object(v3d->camera);	
+			obmat_to_viewmat(v3d, v3d->camera, 0);
+		}
+		else {
+			QuatToMat4(v3d->viewquat, v3d->viewmat);
+			v3d->viewmat[3][2]-= v3d->dist;
+		}
+	}
+	else {
+		
+		QuatToMat4(v3d->viewquat, v3d->viewmat);
+		if(v3d->persp==V3D_PERSP) v3d->viewmat[3][2]-= v3d->dist;
+		if(v3d->ob_centre) {
+			Object *ob= v3d->ob_centre;
+			float vec[3];
+			
+			VECCOPY(vec, ob->obmat[3]);
+			if(ob->type==OB_ARMATURE && v3d->ob_centre_bone[0]) {
+				bPoseChannel *pchan= get_pose_channel(ob->pose, v3d->ob_centre_bone);
+				if(pchan) {
+					VECCOPY(vec, pchan->pose_mat[3]);
+					Mat4MulVecfl(ob->obmat, vec);
+				}
+			}
+			i_translate(-vec[0], -vec[1], -vec[2], v3d->viewmat);
+		}
+		else i_translate(v3d->ofs[0], v3d->ofs[1], v3d->ofs[2], v3d->viewmat);
+	}
+}
+
+void setcameratoview3d(View3D *v3d)
+{
+	Object *ob;
+	float dvec[3];
+	
+	ob= v3d->camera;
+	dvec[0]= v3d->dist*v3d->viewinv[2][0];
+	dvec[1]= v3d->dist*v3d->viewinv[2][1];
+	dvec[2]= v3d->dist*v3d->viewinv[2][2];					
+	VECCOPY(ob->loc, dvec);
+	VecSubf(ob->loc, ob->loc, v3d->ofs);
+	v3d->viewquat[0]= -v3d->viewquat[0];
+	/*  */
+	/*if (ob->transflag & OB_QUAT) {
+		QUATCOPY(ob->quat, v3d->viewquat);
+	} else {*/
+	QuatToEul(v3d->viewquat, ob->rot);
+	/*}*/
+	v3d->viewquat[0]= -v3d->viewquat[0];
+}

source/blender/makesdna/DNA_view3d_types.h

@@ -78,14 +78,12 @@ typedef struct View3D {
 	
 	short blockhandler[8];
 
+	float winmat[4][4];
 	float viewmat[4][4];
 	float viewinv[4][4];
 	float persmat[4][4];
 	float persinv[4][4];
 	
-	float winmat1[4][4];  // persp(1) storage, for swap matrices
-	float viewmat1[4][4];
-	
 	float viewquat[4], dist, zfac;	/* zfac is initgrabz() result */
 	int lay_used; /* used while drawing */