diff --git a/bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay b/bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay index 877a6aab7..44fe10090 100644 --- a/bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay +++ b/bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay @@ -9,7 +9,7 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475) ITEM(Option, ObjShowNormal, SetLabel(t_("Show normals")).SetFont(StdFontZ(8)).RightPosZ(64, 71).BottomPosZ(81, 16)) ITEM(Option, ObjShowLight, SetLabel(t_("Show Light")).SetFont(StdFontZ(8)).RightPosZ(4, 59).BottomPosZ(81, 16)) ITEM(Option, ShowFocus, SetLabel(t_("Show Focus")).LeftPosZ(858, 77).TopPosZ(35, 16)) - ITEM(Option, skybox, SetLabel(t_("Show skybox")).LeftPosZ(349, 80).TopPosZ(33, 15)) + ITEM(Option, skybox, SetLabel(t_("Show skybox")).LeftPosZ(350, 80).TopPosZ(34, 15)) ITEM(Label, fov, SetLabel(t_("FOV:")).SetFont(StdFontZ(11)).LeftPosZ(240, 27).TopPosZ(32, 19)) ITEM(EditIntSpin, fovSelector, LeftPosZ(268, 74).TopPosZ(32, 19)) ITEM(Label, camera, SetLabel(t_("Camera:")).SetFont(StdFontZ(11)).LeftPosZ(7, 44).TopPosZ(33, 19)) @@ -56,7 +56,8 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475) ITEM(Label, dv___54, SetLabel(t_("Angle (quaternion):")).LeftPosZ(450, 97).TopPosZ(35, 13)) ITEM(Option, ObjShowLine, SetLabel(t_("Show line")).SetFont(StdFontZ(8)).RightPosZ(137, 53).BottomPosZ(81, 16)) ITEM(Option, ObjShowSkin, SetLabel(t_("Show Skin")).SetFont(StdFontZ(9)).RightPosZ(192, 58).BottomPosZ(81, 16)) - ITEM(Option, axis, SetLabel(t_("Show axis")).LeftPosZ(377, 64).TopPosZ(8, 15)) + ITEM(Option, depthaxis, SetLabel(t_("No depth")).LeftPosZ(377, 64).TopPosZ(20, 15)) + ITEM(Option, axis, SetLabel(t_("Show axis")).LeftPosZ(376, 64).TopPosZ(4, 15)) ITEM(Button, resetPos, SetLabel(t_("Reset")).LeftPosZ(447, 45).TopPosZ(14, 15)) END_LAYOUT diff --git a/bazaar/SurfaceCtrl_Demo/main.cpp b/bazaar/SurfaceCtrl_Demo/main.cpp index 87342bb62..99daab1c1 100644 --- a/bazaar/SurfaceCtrl_Demo/main.cpp +++ b/bazaar/SurfaceCtrl_Demo/main.cpp @@ -18,9 +18,19 @@ namespace Upp{ } canvas.Refresh(); }; + axis = canvas.IsAxisEnable(); axis.WhenAction = [&]{ canvas.ShowAxis(axis.Get()); + if(axis.Get()) + depthaxis.Enable(); + else + depthaxis.Disable(); + canvas.Refresh(); + }; + depthaxis = canvas.IsDepthAxisEnable(); + depthaxis.WhenAction = [&]{ + canvas.UseDepthAxis(depthaxis.Get()); canvas.Refresh(); };