[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35853] trunk/blender: misc nodes & editors: floats were being implicitly promoted to doubles, adjust to use floats.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 28 19:08:33 CEST 2011
Revision: 35853
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35853
Author: campbellbarton
Date: 2011-03-28 17:08:33 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
misc nodes & editors: floats were being implicitly promoted to doubles, adjust to use floats.
+ minor update to demo_mode
Modified Paths:
--------------
trunk/blender/intern/mikktspace/mikktspace.c
trunk/blender/intern/tools/demo_mode.py
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_info/info_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/python/generic/mathutils_Vector.c
Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/intern/mikktspace/mikktspace.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -243,7 +243,7 @@
int iNrActiveGroups = 0, index = 0;
const int iNrFaces = pContext->m_pInterface->m_getNumFaces(pContext);
tbool bRes = TFALSE;
- const float fThresCos = (const float) cos((fAngularThreshold*M_PI)/180);
+ const float fThresCos = (const float) cos((fAngularThreshold*(float)M_PI)/180.0f);
// verify all call-backs have been set
if( pContext->m_pInterface->m_getNumFaces==NULL ||
Modified: trunk/blender/intern/tools/demo_mode.py
===================================================================
--- trunk/blender/intern/tools/demo_mode.py 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/intern/tools/demo_mode.py 2011-03-28 17:08:33 UTC (rev 35853)
@@ -29,8 +29,6 @@
# ---
'''
-
-
import bpy
import sys
import time
@@ -216,6 +214,10 @@
def modal(self, context, event):
print("DemoMode.modal")
+ if not self.__class__.enabled:
+ self.cleanup(disable=True)
+ return {'CANCELLED'}
+
if event.type == 'ESC':
self.cleanup(disable=True)
# disable here and not in cleanup because this is a user level disable.
@@ -234,9 +236,15 @@
def execute(self, context):
print("func:DemoMode.execute")
- self.__class__.enabled = True
- context.window_manager.modal_handler_add(self)
- return {'RUNNING_MODAL'}
+ # toggle
+ if self.__class__.enabled and self.__class__.first_run == False:
+ # this actually cancells the previous running instance
+ self.__class__.enabled = False
+ return {'CANCELLED'}
+ else:
+ self.__class__.enabled = True
+ context.window_manager.modal_handler_add(self)
+ return {'RUNNING_MODAL'}
def cancel(self, context):
print("func:DemoMode.cancel")
@@ -246,13 +254,10 @@
def menu_func(self, context):
- print("func:menu_func - DemoMode.enabled:", DemoMode.enabled, "bpy.app.driver_namespace:", DemoKeepAlive.secret_attr not in bpy.app.driver_namespace, 'global_state["timer"]:', global_state["timer"])
- if not DemoMode.enabled:
- pass
- if 1:
- layout = self.layout
- layout.operator_context = 'EXEC_DEFAULT'
- layout.operator("wm.demo_mode", icon='PLAY')
+ # print("func:menu_func - DemoMode.enabled:", DemoMode.enabled, "bpy.app.driver_namespace:", DemoKeepAlive.secret_attr not in bpy.app.driver_namespace, 'global_state["timer"]:', global_state["timer"])
+ layout = self.layout
+ layout.operator_context = 'EXEC_DEFAULT'
+ layout.operator("wm.demo_mode", icon='PLAY' if not DemoMode.enabled else 'PAUSE')
def register():
@@ -312,6 +317,8 @@
global_state["basedir"] = basedir
+
+
if __name__ == "__main__":
load_config()
register()
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -182,16 +182,16 @@
t2= cotan_weight(v2, v3, v1);
t3= cotan_weight(v3, v1, v2);
- if(RAD2DEG(angle_v3v3v3(v2, v1, v3)) > 90) obtuse= 1;
- else if(RAD2DEG(angle_v3v3v3(v1, v2, v3)) > 90) obtuse= 2;
- else if(RAD2DEG(angle_v3v3v3(v1, v3, v2)) > 90) obtuse= 3;
+ if(RAD2DEGF(angle_v3v3v3(v2, v1, v3)) > 90) obtuse= 1;
+ else if(RAD2DEGF(angle_v3v3v3(v1, v2, v3)) > 90) obtuse= 2;
+ else if(RAD2DEGF(angle_v3v3v3(v1, v3, v2)) > 90) obtuse= 3;
if (obtuse > 0) {
area= area_tri_v3(v1, v2, v3);
- varea[i1] += (obtuse == 1)? area: area*0.5;
- varea[i2] += (obtuse == 2)? area: area*0.5;
- varea[i3] += (obtuse == 3)? area: area*0.5;
+ varea[i1] += (obtuse == 1)? area: area*0.5f;
+ varea[i2] += (obtuse == 2)? area: area*0.5f;
+ varea[i3] += (obtuse == 3)? area: area*0.5f;
}
else {
len1= len_v3v3(v2, v3);
@@ -492,7 +492,7 @@
sub_v3_v3v3(data.vec, end, data.start);
madd_v3_v3v3fl(data.start, data.start, data.vec, 1e-5);
- mul_v3_fl(data.vec, 1.0f - 2e-5);
+ mul_v3_fl(data.vec, 1.0f - 2e-5f);
/* pass normalized vec + distance to bvh */
hit.index = -1;
@@ -1041,9 +1041,9 @@
#define MESHDEFORM_TAG_INTERIOR 2
#define MESHDEFORM_TAG_EXTERIOR 3
-#define MESHDEFORM_LEN_THRESHOLD 1e-6
+#define MESHDEFORM_LEN_THRESHOLD 1e-6f
-#define MESHDEFORM_MIN_INFLUENCE 0.0005
+#define MESHDEFORM_MIN_INFLUENCE 0.0005f
static int MESHDEFORM_OFFSET[7][3] =
{{0,0,0}, {1,0,0}, {-1,0,0}, {0,1,0}, {0,-1,0}, {0,0,1}, {0,0,-1}};
@@ -1146,7 +1146,7 @@
isectco[1]= (1.0f - u - v)*vert0[1] + u*vert1[1] + v*vert2[1];
isectco[2]= (1.0f - u - v)*vert0[2] + u*vert1[2] + v*vert2[2];
- uvw[0]= 1.0 - u - v;
+ uvw[0]= 1.0f - u - v;
uvw[1]= u;
uvw[2]= v;
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -430,7 +430,7 @@
}
#endif
- if((float)uz - 0.00001 > depth)
+ if((float)uz - 0.00001f > depth)
return 0;
else
return 1;
@@ -3246,7 +3246,7 @@
if(isect_line_tri_v3(co1, co2, v1, v2, v3, &cur_d, cur_uv)){
if(cur_d<*min_d){
*min_d=cur_d;
- min_w[0]= 1.0 - cur_uv[0] - cur_uv[1];
+ min_w[0]= 1.0f - cur_uv[0] - cur_uv[1];
min_w[1]= cur_uv[0];
min_w[2]= cur_uv[1];
min_w[3]= 0.0f;
@@ -3260,7 +3260,7 @@
if(isect_line_tri_v3(co1, co2, v1, v3, v4, &cur_d, cur_uv)){
if(cur_d<*min_d){
*min_d=cur_d;
- min_w[0]= 1.0 - cur_uv[0] - cur_uv[1];
+ min_w[0]= 1.0f - cur_uv[0] - cur_uv[1];
min_w[1]= 0.0f;
min_w[2]= cur_uv[0];
min_w[3]= cur_uv[1];
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -147,12 +147,12 @@
float *rf= rectf;
float srgb[3];
char *rc= rectc;
- const float dither = ibuf->dither / 255.0;
+ const float dither = ibuf->dither / 255.0f;
/* XXX temp. because crop offset */
if( rectc >= (char *)(ibuf->rect)) {
for(x1= 0; x1<xmax; x1++, rf += 4, rc+=4) {
- const float d = (BLI_frand()-0.5)*dither;
+ const float d = (BLI_frand()-0.5f)*dither;
srgb[0]= d + linearrgb_to_srgb(rf[0]);
srgb[1]= d + linearrgb_to_srgb(rf[1]);
srgb[2]= d + linearrgb_to_srgb(rf[2]);
@@ -176,7 +176,7 @@
/* XXX temp. because crop offset */
if( rectc >= (char *)(ibuf->rect)) {
for(x1= 0; x1<xmax; x1++, rf += 4, rc+=4) {
- const float d = (BLI_frand()-0.5)*dither;
+ const float d = (BLI_frand()-0.5f)*dither;
rgb[0] = d + rf[0];
rgb[1] = d + rf[1];
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -2766,7 +2766,7 @@
else sync= (scene->flag & SCE_FRAME_DROP);
if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene)))
- scene->r.cfra = time * FPS + 0.5;
+ scene->r.cfra = (double)time * FPS + 0.5;
else
{
if (sync) {
Modified: trunk/blender/source/blender/editors/space_info/info_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_ops.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/space_info/info_ops.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -322,11 +322,11 @@
* inactive regions, so use this for now. --matt
*/
-#define INFO_TIMEOUT 5.0
-#define INFO_COLOR_TIMEOUT 3.0
-#define ERROR_TIMEOUT 10.0
-#define ERROR_COLOR_TIMEOUT 6.0
-#define COLLAPSE_TIMEOUT 0.25
+#define INFO_TIMEOUT 5.0f
+#define INFO_COLOR_TIMEOUT 3.0f
+#define ERROR_TIMEOUT 10.0f
+#define ERROR_COLOR_TIMEOUT 6.0f
+#define COLLAPSE_TIMEOUT 0.25f
static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event)
{
wmWindowManager *wm= CTX_wm_manager(C);
@@ -353,7 +353,7 @@
color_timeout = (report->type & RPT_ERROR_ALL)?ERROR_COLOR_TIMEOUT:INFO_COLOR_TIMEOUT;
/* clear the report display after timeout */
- if (reports->reporttimer->duration > timeout) {
+ if ((float)reports->reporttimer->duration > timeout) {
WM_event_remove_timer(wm, NULL, reports->reporttimer);
reports->reporttimer = NULL;
@@ -381,8 +381,8 @@
rti->widthfac=1.0;
}
- progress = reports->reporttimer->duration / timeout;
- color_progress = reports->reporttimer->duration / color_timeout;
+ progress = (float)reports->reporttimer->duration / timeout;
+ color_progress = (float)reports->reporttimer->duration / color_timeout;
/* save us from too many draws */
if(color_progress <= 1.0f) {
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2011-03-28 17:06:15 UTC (rev 35852)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2011-03-28 17:08:33 UTC (rev 35853)
@@ -1175,7 +1175,7 @@
fx = (bufx > 0.0f ? ((float)mx - 0.5f*ar->winx - snode->xof) / bufx + 0.5f : 0.0f);
fy = (bufy > 0.0f ? ((float)my - 0.5f*ar->winy - snode->yof) / bufy + 0.5f : 0.0f);
- if(fx>=0.0 && fy>=0.0 && fx<1.0 && fy<1.0) {
+ if(fx>=0.0f && fy>=0.0f && fx<1.0f && fy<1.0f) {
float *fp;
char *cp;
int x= (int)(fx*ibuf->x), y= (int)(fy*ibuf->y);
Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list