*/}}
Browse Source

Default 3d object size change

YimingWu 1 year ago
parent
commit
8fcf115c62
2 changed files with 7 additions and 7 deletions
  1. 6 6
      la_tns_kernel.c
  2. 1 1
      resources/la_widgets_viewers.c

+ 6 - 6
la_tns_kernel.c

@@ -3512,7 +3512,7 @@ tnsCamera *tnsCreateCamera(tnsObject *under, char *Name, real FOV,
     c->FOV = FOV;
     c->CameraType = TNS_CAMERA_PERSP;
     c->ZMin = 0.1f;
-    c->ZMax = 1000.0f;
+    c->ZMax = 200.0f;
     c->FocusDistance = FocusDistance;
     c->OrthScale = 1.0f;
 
@@ -3697,22 +3697,22 @@ void tnsDrawPlaceholder(tnsObject* o, tnsEvaluateData* ed){
         elif(o->Flags&TNS_OBJECT_FLAGS_SELECTED){ tnsColor4dv(laAccentColor(LA_BT_NORMAL)); }
         else tnsColor4dv(laThemeColor(_LA_THEME_3D_VIEW,LA_BT_BORDER));
     }
-    tnsDrawCross(0,0,0,-1,5,-1,5,-1,5);
+    tnsDrawCross(0,0,0,-0.2,1,-0.2,1,-0.2,1);
     tnsPackAs(GL_LINES);
     tnsFlush();
 }
 
 void tnsDrawEmptySelectionID(tnsEvaluatedInstance* ei, void* unused){
     int i=ei->InstanceSelectionID; real color[4]={0,0,0,1}; TNS_ID_TO_COLOR(color,i); tnsColor4dv(color);
-    tnsDrawCross(0,0,0,-1,5,-1,5,-1,5); tnsPackAs(GL_LINES); tnsFlush();
+    tnsDrawCross(0,0,0,-0.2,1,-0.2,1,-0.2,1); tnsPackAs(GL_LINES); tnsFlush();
 }
 void tnsDrawEmptyOutline(tnsEvaluatedInstance* ei, void* unused){
     real* color=(ei->IsActive)?laAccentColor(LA_BT_TEXT):laAccentColor(LA_BT_NORMAL); tnsColor4dv(color);
-    tnsDrawCross(0,0,0,-1,5,-1,5,-1,5); tnsLineWidth(3);tnsPackAs(GL_LINES); tnsLineWidth(1); tnsFlush();
+    tnsDrawCross(0,0,0,-0.2,1,-0.2,1,-0.2,1); tnsLineWidth(3);tnsPackAs(GL_LINES); tnsLineWidth(1); tnsFlush();
 }
 void tnsDrawEmptyObject(tnsEvaluatedInstance* ei, void* unused){
     tnsColor4dv(laThemeColor(_LA_THEME_3D_VIEW,LA_BT_BORDER));
-    tnsDrawCross(0,0,0,-1,5,-1,5,-1,5);tnsLineWidth(3); tnsPackAs(GL_LINES); tnsLineWidth(1); tnsFlush();
+    tnsDrawCross(0,0,0,-0.2,1,-0.2,1,-0.2,1);tnsLineWidth(3); tnsPackAs(GL_LINES); tnsLineWidth(1); tnsFlush();
 }
 void tnsEvaluateEmptyObject(tnsObject* o, tnsEvaluateData* ed){
     tnsAddEvaluatedInstance(ed,o,tnsDrawEmptyObject,TNS_EVAL_LAYER_SOLID,0,0,0);
@@ -4460,7 +4460,7 @@ void tnsDrawFloor(real* CamPosition, real Far, int *ShowAxis){
         real uy=ymin; while(uy<ymax){ tnsVertex2d(xmin,uy),tnsVertex2d(xmax,uy); uy+=sp; }
         tnsPackAs(GL_LINES);
         tnsFlush();
-        Far/=4; if(Far<height) break;
+        Far/=3; if(Far<height) break;
         dist=sqrt(Far*Far-height*height); sp/=10;
         glUniform1f(T->FloorShader->uFar,Far);
     }

+ 1 - 1
resources/la_widgets_viewers.c

@@ -574,7 +574,7 @@ void laDefault3DViewOverlay(laUiItem *ui){
 }
 void la_3DViewEnsureCamera(laCanvasExtra* e){
     if(e->ViewingCamera) return;
-    tnsVector3d pos={-15, -20, 7};
+    tnsVector3d pos={-3, -4, 1.5};
     tnsCamera* c= tnsCreateCamera(0, "VIEWING_CAMERA", rad(50), LA_COLOR3(pos), rad(70), 0, rad(-40), 25);
     memAssignRef(e,&e->ViewingCamera,c);
     tnsVector3d target={0,0,0}; tnsVector3d up={0,0,1};