github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-20 06:05:32 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

SurfaceCtrl_Demo: Tiny update on lay, added ConsoleOutput only when Debug and MSC

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15054 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
xemuth 2020-09-16 15:21:25 +00:00
parent a871dcce09
commit 23bd154748
2 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay
View file

@ -1,5 +1,5 @@
LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(SurfaceCtrl, canvas, SetFrame(ThinInsetFrame()).HSizePosZ(2, 253).VSizePosZ(56, 1))
ITEM(SurfaceCtrl, canvas, HSizePosZ(-1, 252).VSizePosZ(56, -1))
ITEM(Label, dv___1, SetLabel(t_("File :")).LeftPosZ(7, 28).TopPosZ(7, 18))
ITEM(EditString, filename, LeftPosZ(33, 159).TopPosZ(6, 19))
ITEM(Button, butOpen, SetLabel(t_("Open")).LeftPosZ(193, 44).TopPosZ(6, 19))
@ -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(350, 80).TopPosZ(34, 15))
ITEM(Option, skybox, SetLabel(t_("Show skybox")).LeftPosZ(349, 80).TopPosZ(33, 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))
@ -17,16 +17,16 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(LabelBox, dv___15, SetLabel(t_("Camera values")).SetFont(StdFont().Bold()).LeftPosZ(444, 819).TopPosZ(0, 55))
ITEM(Label, frontvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 89).TopPosZ(38, 13))
ITEM(Label, dv___17, SetLabel(t_("Angle (quaternion):")).RightPosZ(146, 97).BottomPosZ(37, 13))
ITEM(EditDouble, quatZ, LeftPosZ(658, 34).TopPosZ(32, 19))
ITEM(EditDouble, ObjScalZ, RightPosZ(52, 40).BottomPosZ(9, 19))
ITEM(EditDouble, camPosZ, LeftPosZ(652, 40).TopPosZ(11, 19))
ITEM(EditDouble, quatX, LeftPosZ(586, 34).TopPosZ(32, 19))
ITEM(EditDouble, quatY, LeftPosZ(622, 34).TopPosZ(32, 19))
ITEM(EditDouble, ObjScalY, RightPosZ(95, 40).BottomPosZ(9, 19))
ITEM(EditDouble, camPosY, LeftPosZ(610, 40).TopPosZ(11, 19))
ITEM(EditDouble, focusZ, LeftPosZ(989, 31).TopPosZ(11, 19))
ITEM(EditDouble, focusY, LeftPosZ(956, 31).TopPosZ(11, 19))
ITEM(EditDouble, focusX, LeftPosZ(923, 31).TopPosZ(11, 19))
ITEM(EditInt64, quatZ, LeftPosZ(658, 34).TopPosZ(32, 19))
ITEM(EditInt64, ObjScalZ, RightPosZ(52, 40).BottomPosZ(9, 19))
ITEM(EditInt64, camPosZ, LeftPosZ(652, 40).TopPosZ(11, 19))
ITEM(EditInt64, quatX, LeftPosZ(586, 34).TopPosZ(32, 19))
ITEM(EditInt64, quatY, LeftPosZ(622, 34).TopPosZ(32, 19))
ITEM(EditInt64, ObjScalY, RightPosZ(95, 40).BottomPosZ(9, 19))
ITEM(EditInt64, camPosY, LeftPosZ(610, 40).TopPosZ(11, 19))
ITEM(EditInt64, focusZ, LeftPosZ(989, 31).TopPosZ(11, 19))
ITEM(EditInt64, focusY, LeftPosZ(956, 31).TopPosZ(11, 19))
ITEM(EditInt64, focusX, LeftPosZ(923, 31).TopPosZ(11, 19))
ITEM(Label, dv___28, SetLabel(t_("Front vector :")).SetFont(StdFontZ(10)).LeftPosZ(697, 67).TopPosZ(38, 13))
ITEM(Label, onObjectBool, SetLabel(t_("true")).SetFont(StdFontZ(10)).LeftPosZ(995, 24).TopPosZ(36, 13))
ITEM(Label, dv___30, SetLabel(t_("Right vector :")).SetFont(StdFontZ(10)).LeftPosZ(698, 64).TopPosZ(23, 13))
@ -34,20 +34,20 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(Label, rightvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 89).TopPosZ(23, 13))
ITEM(Label, upvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 89).TopPosZ(8, 13))
ITEM(Button, zoomToFit, SetLabel(t_("Fit camera")).LeftPosZ(1028, 78).TopPosZ(10, 18))
ITEM(EditDouble, quatW, LeftPosZ(550, 34).TopPosZ(32, 19))
ITEM(EditInt64, quatW, LeftPosZ(550, 34).TopPosZ(32, 19))
ITEM(TreeCtrl, AllObjects, RightPosZ(3, 249).VSizePosZ(56, 117))
ITEM(Label, dv___37, SetLabel(t_("Scale (xyz):")).RightPosZ(181, 62).BottomPosZ(11, 13))
ITEM(Label, dv___38, SetLabel(t_("Position (xyz):")).LeftPosZ(495, 71).TopPosZ(15, 13))
ITEM(EditDouble, ObjQuatW, RightPosZ(115, 29).BottomPosZ(34, 19))
ITEM(EditDouble, ObjQuatX, RightPosZ(85, 29).BottomPosZ(34, 19))
ITEM(EditDouble, ObjQuatZ, RightPosZ(25, 29).BottomPosZ(34, 19))
ITEM(EditDouble, ObjQuatY, RightPosZ(55, 29).BottomPosZ(34, 19))
ITEM(EditDouble, ObjScalX, RightPosZ(138, 40).BottomPosZ(9, 19))
ITEM(EditDouble, ObjPosZ, RightPosZ(41, 40).BottomPosZ(58, 19))
ITEM(EditDouble, ObjPosY, RightPosZ(84, 40).BottomPosZ(58, 19))
ITEM(EditInt64, ObjQuatW, RightPosZ(115, 29).BottomPosZ(34, 19))
ITEM(EditInt64, ObjQuatX, RightPosZ(85, 29).BottomPosZ(34, 19))
ITEM(EditInt64, ObjQuatZ, RightPosZ(25, 29).BottomPosZ(34, 19))
ITEM(EditInt64, ObjQuatY, RightPosZ(55, 29).BottomPosZ(34, 19))
ITEM(EditInt64, ObjScalX, RightPosZ(138, 40).BottomPosZ(9, 19))
ITEM(EditInt64, ObjPosZ, RightPosZ(41, 40).BottomPosZ(58, 19))
ITEM(EditInt64, ObjPosY, RightPosZ(84, 40).BottomPosZ(58, 19))
ITEM(Label, dv___46, SetLabel(t_("Position (xyz):")).RightPosZ(172, 71).BottomPosZ(62, 13))
ITEM(EditDouble, ObjPosX, RightPosZ(127, 40).BottomPosZ(58, 19))
ITEM(EditDouble, camPosX, LeftPosZ(568, 40).TopPosZ(11, 19))
ITEM(EditInt64, ObjPosX, RightPosZ(127, 40).BottomPosZ(58, 19))
ITEM(EditInt64, camPosX, LeftPosZ(568, 40).TopPosZ(11, 19))
ITEM(Label, dv___49, SetLabel(t_("Up vector :")).SetFont(StdFontZ(10)).LeftPosZ(699, 58).TopPosZ(8, 13))
ITEM(Label, dv___50, SetLabel(t_("On Object :")).SetFont(StdFontZ(10)).LeftPosZ(937, 55).TopPosZ(36, 13))
ITEM(Label, dv___51, SetLabel(t_("To Rotate around an object, \nWheel Click the object.")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1134, 126).TopPosZ(29, 24))
@ -56,8 +56,7 @@ 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, 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(Option, axis, SetLabel(t_("Show axis")).LeftPosZ(377, 64).TopPosZ(8, 15))
ITEM(Button, resetPos, SetLabel(t_("Reset")).LeftPosZ(447, 45).TopPosZ(14, 15))
END_LAYOUT

2
bazaar/SurfaceCtrl_Demo/main.cpp
View file

@ -289,7 +289,9 @@ namespace Upp{
GUI_APP_MAIN
{
#if defined(flagDEBUG) && defined(flagMSC)
Upp::ConsoleOutput con(true);
#endif
Upp::StdLogSetup( Upp::LOG_COUT | Upp::LOG_FILE);
Upp::SurfaceCtrl_Demo().Run();
}