*/}}
YimingWu 2 лет назад
Родитель
Сommit
97728d00d2
3 измененных файлов с 11 добавлено и 4 удалено
  1. 2 2
      la_kernel.c
  2. 5 1
      resources/la_nodes_basic.c
  3. 4 1
      resources/la_translations.c

+ 2 - 2
la_kernel.c

@@ -799,8 +799,8 @@ void la_SaveEvent(Window hwnd, laEvent *e, int use_last_pos){
     if(use_last_pos){ e->x=MAIN.evLastX; e->y=MAIN.evLastY; }
 
     e->Pressure=MAIN.IsPen?(MAIN.PointerIsEraser?MAIN.EraserPressure:MAIN.StylusPressure):0.5f;
-    e->AngleX=MAIN.PointerIsEraser?MAIN.EraserAngleX:MAIN.StylusAngleX;
-    e->AngleY=MAIN.PointerIsEraser?MAIN.EraserAngleY:MAIN.StylusAngleY;
+    e->AngleX=rad(MAIN.PointerIsEraser?MAIN.EraserAngleX:MAIN.StylusAngleX);
+    e->AngleY=rad(MAIN.PointerIsEraser?MAIN.EraserAngleY:MAIN.StylusAngleY);
     e->IsEraser=MAIN.PointerIsEraser;
 
     lstAppendItem(el, (laListItem *)e);

+ 5 - 1
resources/la_nodes_basic.c

@@ -655,7 +655,10 @@ int IDN_VectorMathEval(laVectorMathNode* n){
     case LA_VECTOR_MATH_OP_POW:n->Out->ArrLen=maxlen; for(int i=0;i<maxlen;i++)n->rOut[i]=pow(vl[i],vr[i]); break;
     case LA_VECTOR_MATH_OP_LOG:n->Out->ArrLen=maxlen; for(int i=0;i<maxlen;i++)n->rOut[i]=log2(vl[i])/log2(vr[i]); break;
     case LA_VECTOR_MATH_OP_CROSS: if(maxlen<3) return 0; n->Out->ArrLen=3; tnsVectorCross3d(n->rOut,vl,vr); break;
-    case LA_VECTOR_MATH_OP_DOT: if(maxlen<2) return 0; n->Out->ArrLen=maxlen; if(maxlen==2) n->rOut[0]=tnsDot2d(vl,vr,0); else n->rOut[0]=tnsDot3d(vl,vr,0); break;
+    case LA_VECTOR_MATH_OP_DOT: if(maxlen<2) return 0; n->Out->ArrLen=1; if(maxlen==2) n->rOut[0]=tnsDot2d(vl,vr,0); else n->rOut[0]=tnsDot3d(vl,vr,0); break;
+    case LA_VECTOR_MATH_OP_LEN: if(maxlen<2) return 0; n->Out->ArrLen=1;
+        if(maxlen==2){ tnsVector2d d; tnsVectorMinus2d(d,vr,vl); n->rOut[0]=tnsLength2d(d); }
+        else { tnsVector3d d; tnsVectorMinus2d(d,vr,vl); n->rOut[0]=tnsLength3d(d); } break;
     case LA_VECTOR_MATH_OP_NORMALIZE: if(maxlen<2) return 0; n->Out->ArrLen=maxlen; if(maxlen==2) tnsNormalize2d(n->rOut, vl); else tnsNormalize3d(n->rOut, vl); break;
     }
     return 1;
@@ -1222,6 +1225,7 @@ void la_RegisterInputMapperOperators(){
     laAddEnumItemAs(p,"DOT", "Dot", "L . R", LA_VECTOR_MATH_OP_DOT, 0);
     laAddEnumItemAs(p,"POW", "Power", "pow(L,R)", LA_VECTOR_MATH_OP_POW, 0);
     laAddEnumItemAs(p,"LOG", "Log", "log(L)base(R)", LA_VECTOR_MATH_OP_LOG, 0);
+    laAddEnumItemAs(p,"LEN", "Length", "Length(L)", LA_VECTOR_MATH_OP_LEN, 0);
     laAddEnumItemAs(p,"NORM", "Normalize", "Normalize(L)", LA_VECTOR_MATH_OP_NORMALIZE, 0);
 
     pc=laAddPropertyContainer("la_comment_node", "Comment", "Comment",0,laui_CommentNode,sizeof(laCommentNode),lapost_Node,0,1);

+ 4 - 1
resources/la_translations.c

@@ -19,12 +19,15 @@
 #include "la_5.h"
 
 static const char *entries[]={
+"🡻 Minimized","🡻 隐藏的面板",
+"Length","长度",
+"Fullscreen","全屏",
 "Multiply (component)","相乘(分量)",
 "Cross","叉乘",
 "Dot","点乘",
 "Append","追加",
 "Restore","恢复",
-"Combine 🡲","合并",
+"Combine 🡲","合并 🡲",
 "New Layout","新布局",
 "Divide (component)","相除(分量)",
 "Color Picker Gamma","拾色器伽玛",