[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44718] trunk/blender/source: change camera zoom from short to float.

Campbell Barton ideasman42 at gmail.com
Wed Mar 7 20:42:28 CET 2012


Revision: 44718
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44718
Author:   campbellbarton
Date:     2012-03-07 19:42:22 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
change camera zoom from short to float.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-03-07 19:19:58 UTC (rev 44717)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-03-07 19:42:22 UTC (rev 44718)
@@ -1633,7 +1633,7 @@
 	if (delta < 0) {
 		/* this min and max is also in viewmove() */
 		if (use_cam_zoom) {
-			rv3d->camzoom-= 10;
+			rv3d->camzoom -= 10.0f;
 			if (rv3d->camzoom < RV3D_CAMZOOM_MIN) rv3d->camzoom= RV3D_CAMZOOM_MIN;
 		}
 		else if (rv3d->dist < 10.0f * v3d->far) {
@@ -1642,7 +1642,7 @@
 	}
 	else {
 		if (use_cam_zoom) {
-			rv3d->camzoom+= 10;
+			rv3d->camzoom += 10.0f;
 			if (rv3d->camzoom > RV3D_CAMZOOM_MAX) rv3d->camzoom= RV3D_CAMZOOM_MAX;
 		}
 		else if (rv3d->dist> 0.001f * v3d->grid) {

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2012-03-07 19:19:58 UTC (rev 44717)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2012-03-07 19:42:22 UTC (rev 44718)
@@ -94,6 +94,24 @@
 	float viewmatob[4][4];
 	float persmatob[4][4];
 
+
+	/* user defined clipping planes */
+	float clip[6][4];
+	float clip_local[6][4]; /* clip in object space, means we can test for clipping in editmode without first going into worldspace */
+	struct BoundBox *clipbb;
+
+	struct bGPdata *gpd;		/* Grease-Pencil Data (annotation layers) */
+
+	struct RegionView3D *localvd; /* allocated backup of its self while in localview */
+	struct RenderInfo *ri;
+	struct RenderEngine *render_engine;
+	struct ViewDepths *depths;
+
+	/* animated smooth view */
+	struct SmoothViewStore *sms;
+	struct wmTimer *smooth_timer;
+
+
 	/* transform widget matrix */
 	float twmat[4][4];
 
@@ -104,32 +122,17 @@
 	float pixsize;				/* runtime only */
 	float ofs[3];				/* view center & orbit pivot, negative of worldspace location,
 								 * also matches -viewinv[3][0:3] in ortho mode.*/
-	short camzoom;				/* viewport zoom on the camera frame, see BKE_screen_view3d_zoom_to_fac */
-	short twdrawflag;
+	float camzoom;				/* viewport zoom on the camera frame, see BKE_screen_view3d_zoom_to_fac */
 	char is_persp;				/* check if persp/ortho view, since 'persp' cant be used for this since
 								 * it can have cameras assigned as well. (only set in setwinmatrixview3d) */
-	char pad[3];
+	char persp;
+	char view;
+	char viewlock;
+
+	short twdrawflag;
+	short rflag;
 	
-	short rflag, viewlock;
-	short persp;
-	short view;
-	
-	/* user defined clipping planes */
-	float clip[6][4];
-	float clip_local[6][4]; /* clip in object space, means we can test for clipping in editmode without first going into worldspace */
-	struct BoundBox *clipbb;	
-	
-	struct bGPdata *gpd;		/* Grease-Pencil Data (annotation layers) */
-	
-	struct RegionView3D *localvd; /* allocated backup of its self while in localview */
-	struct RenderInfo *ri;
-	struct RenderEngine *render_engine;
-	struct ViewDepths *depths;
-	
-	/* animated smooth view */
-	struct SmoothViewStore *sms;
-	struct wmTimer *smooth_timer;
-	
+
 	/* last view */
 	float lviewquat[4];
 	short lpersp, lview; /* lpersp can never be set to 'RV3D_CAMOB' */
@@ -137,11 +140,10 @@
 	
 	float twangle[3];
 
+
 	/* active rotation from NDOF or elsewhere */
 	float rot_angle;
 	float rot_axis[3];
-	
-	char pad2[4];
 
 } RegionView3D;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-03-07 19:19:58 UTC (rev 44717)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-03-07 19:42:22 UTC (rev 44718)
@@ -1728,9 +1728,10 @@
 	RNA_def_property_ui_text(prop, "Distance", "Distance to the view location");
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
-	prop = RNA_def_property(srna, "view_camera_zoom", PROP_INT, PROP_UNSIGNED);
-	RNA_def_property_int_sdna(prop, NULL, "camzoom");
+	prop = RNA_def_property(srna, "view_camera_zoom", PROP_FLOAT, PROP_UNSIGNED);
+	RNA_def_property_float_sdna(prop, NULL, "camzoom");
 	RNA_def_property_ui_text(prop, "Camera Zoom", "Zoom factor in camera view");
+	RNA_def_property_range(prop, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX);
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "view_camera_offset", PROP_FLOAT, PROP_NONE);

Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp	2012-03-07 19:19:58 UTC (rev 44717)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp	2012-03-07 19:42:22 UTC (rev 44718)
@@ -269,7 +269,7 @@
 				draw_letterbox = 1;
 			}
 			else {
-				camzoom = 1.0 / BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
+				camzoom = 1.0f / BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
 			}
 		}
 		else {




More information about the Bf-blender-cvs mailing list