*/}}
浏览代码

Fix errors and special key

YimingWu 1 年之前
父节点
当前提交
6321a28a13
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 3 3
      la_kernel.c
  2. 2 2
      la_tns_kernel.c

+ 3 - 3
la_kernel.c

@@ -384,7 +384,7 @@ void la_glDebugOutput(GLenum source, GLenum type, unsigned int id,
     // ignore non-significant error/warning codes
     if (id==131169 || id==131185 || id==131218 || id==131204 || id==131076) return;
 
-    printf("GL %d: %s\n", id, message);
+    logPrint("GL %d: %s\n", id, message);
 
     char* strsource="",*strtype="",*strseverity="";
 
@@ -415,7 +415,7 @@ void la_glDebugOutput(GLenum source, GLenum type, unsigned int id,
     case GL_DEBUG_SEVERITY_LOW:          strseverity = "Low"; break;
     case GL_DEBUG_SEVERITY_NOTIFICATION: strseverity = "Notification"; break;
     }
-    printf("%s | %s | %s\n\n", strsource,strtype,strseverity);
+    logPrint("%s | %s | %s\n\n", strsource,strtype,strseverity);
 }
 
 void la_SetCurrentGLContextDebug(){
@@ -1368,7 +1368,7 @@ void la_MakeSpecialKeyBit(SYSWINDOW hwnd,laWindow*wnd,laEvent *e,int use_last_po
     laEvent* last_e=el->pLast;
     SYSWINDOW root_ret, win_ret; int rrx=0,rry=0,rx=e->x,ry=e->y,rmask=0;
 #ifdef __linux__
-    //XQueryPointer(MAIN.dpy, wnd->win, &root_ret,&win_ret,&rrx,&rry,&rx,&ry,&rmask);
+    XQueryPointer(MAIN.dpy, wnd->win, &root_ret,&win_ret,&rrx,&rry,&rx,&ry,&rmask);
     e->SpecialKeyBit = ((rmask&ShiftMask)?LA_KEY_SHIFT:0)|((rmask&ControlMask)?LA_KEY_CTRL:0)|((rmask&Mod1Mask)?LA_KEY_ALT:0);
 #endif
 #ifdef _WIN32

+ 2 - 2
la_tns_kernel.c

@@ -4650,7 +4650,7 @@ void tnsMakeFoucsSquare(int L, int R, int U, int B, int W){
 void tnsDrawFloor(real* CamPosition, real Far, int *ShowAxis){
     real OrigFar=Far;
     real height=CamPosition[2];
-    real dist=sqrt(Far*Far-height*height);
+    real dist=sqrt(fabs(Far*Far-height*height));
     real spanstart=Far/10000;
     real spanl=1e-3,spanh=1e-3;
     while((spanl*10)<spanstart){ spanl*=10; } spanh=spanl;
@@ -4673,7 +4673,7 @@ void tnsDrawFloor(real* CamPosition, real Far, int *ShowAxis){
         tnsPackAs(GL_LINES);
         tnsFlush();
         Far/=3; if(Far<height) break;
-        dist=sqrt(Far*Far-height*height); sp/=10;
+        dist=sqrt(fabs(Far*Far-height*height)); sp/=10;
         glUniform1f(T->FloorShader->uFar,Far);
     }