Page MenuHome
Files F4204

blender_logic_update.txt
Public
Actions

blender_logic_update.txt
View Options

RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_logic.c,v
retrieving revision 1.40
diff -u -r1.40 buttons_logic.c
--- source/blender/src/buttons_logic.c 1 Dec 2006 01:04:27 -0000 1.40
+++ source/blender/src/buttons_logic.c 20 Dec 2006 09:29:16 -0000
@@ -1488,52 +1488,54 @@
{
- ysize= 129;
+ ysize= 148;
glRects(xco, yco-ysize, xco+width, yco);
uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
oa = act->data;
- wval = (width-100)/3;
+ wval = (width-105)/3;
+ uiDefBut(block, LABEL, 0 , "X ", xco+69, yco-20, 15, 19, NULL, 0,0, 0, 0, "X Axis");
+ uiDefBut(block, LABEL, 0 , "Y", xco+125, yco-20, 15, 19, NULL, 0,0, 0, 0, "Y Axis");
+ uiDefBut(block, LABEL, 0 , "Z", xco+184, yco-20, 15, 19, NULL, 0,0, 0, 0, "Z Axis");
+ uiDefBut(block, LABEL, 0, "Force", xco, yco-40, 55, 19, NULL, 0, 0, 0, 0, "Sets the force");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-40, wval, 19, oa->forceloc, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-40, wval, 19, oa->forceloc+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-40, wval, 19, oa->forceloc+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefBut(block, LABEL, 0, "Torque", xco, yco-59, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-59, wval, 19, oa->forcerot, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-59, wval, 19, oa->forcerot+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-59, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefBut(block, LABEL, 0, "dLoc", xco, yco-80, 45, 19, NULL, 0, 0, 0, 0, "Sets the dLoc");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-80, wval, 19, oa->dloc, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-80, wval, 19, oa->dloc+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-80, wval, 19, oa->dloc+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefBut(block, LABEL, 0, "dRot", xco, yco-96, 45, 19, NULL, 0, 0, 0, 0, "Sets the dRot");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-96, wval, 19, oa->drot, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-96, wval, 19, oa->drot+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-96, wval, 19, oa->drot+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefBut(block, LABEL, 0, "linV", xco, yco-119, 45, 19, NULL, 0, 0, 0, 0, "Sets the linear velocity");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-119, wval, 19, oa->linearvelocity, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-119, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-119, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefBut(block, LABEL, 0, "angV", xco, yco-138, 45, 19, NULL, 0, 0, 0, 0, "Sets the angular velocity");
+ uiDefButF(block, NUM, 0, "", xco+48, yco-138, wval, 19, oa->angularvelocity, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+wval, yco-138, wval, 19, oa->angularvelocity+1, -10000.0, 10000.0, 10, 0, "");
+ uiDefButF(block, NUM, 0, "", xco+48+2*wval, yco-138, wval, 19, oa->angularvelocity+2, -10000.0, 10000.0, 10, 0, "");
+
+ uiDefButBitI(block, TOG, ACT_FORCE_LOCAL, 0, "L", xco+48+3*wval, yco-40, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+ uiDefButBitI(block, TOG, ACT_TORQUE_LOCAL, 0, "L", xco+48+3*wval, yco-59, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+ uiDefButBitI(block, TOG, ACT_DLOC_LOCAL, 0, "L", xco+48+3*wval, yco-80, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+ uiDefButBitI(block, TOG, ACT_DROT_LOCAL, 0, "L", xco+48+3*wval, yco-96, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+ uiDefButBitI(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L", xco+48+3*wval, yco-119, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+ uiDefButBitI(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L", xco+48+3*wval, yco-138, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
eb/2d/fc219b59c9da83e65043d640800b

Event Timeline