github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-12 22:04:24 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

SurfaceCtrl_Demo: Added ZoomToFit

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15027 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
xemuth 2020-09-12 22:59:36 +00:00
parent ba29b5a0ec
commit c19de57e0f
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.lay
View file

@ -2,9 +2,9 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(SurfaceCtrl, canvas, SetFrame(ThinInsetFrame()).HSizePosZ(2, 253).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")).HCenterPosZ(44, -418).TopPosZ(6, 19))
ITEM(Button, butOpen, SetLabel(t_("Open")).LeftPosZ(193, 44).TopPosZ(6, 19))
ITEM(Button, Ultimate, SetLabel(t_("Ultimate++ !")).LeftPosZ(305, 68).TopPosZ(6, 19))
ITEM(Button, OpenEarth, SetLabel(t_("Open Earth")).HCenterPosZ(64, -362).TopPosZ(6, 19))
ITEM(Button, OpenEarth, SetLabel(t_("Open Earth")).LeftPosZ(239, 64).TopPosZ(6, 19))
ITEM(Switch, cameraView, SetLabel(t_("Perspective view\nParallel view")).LeftPosZ(54, 178).TopPosZ(35, 16))
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))
@ -14,7 +14,7 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(EditIntSpin, fovSelector, LeftPosZ(268, 74).TopPosZ(32, 19))
ITEM(Label, camera, SetLabel(t_("Camera:")).SetFont(StdFontZ(11)).LeftPosZ(7, 44).TopPosZ(33, 19))
ITEM(LabelBox, dv___14, SetLabel(t_("Object values")).SetFont(StdFont().Bold()).RightPosZ(3, 249).BottomPosZ(1, 112))
ITEM(LabelBox, dv___15, SetLabel(t_("Camera values")).SetFont(StdFont().Bold()).HCenterPosZ(580, 101).TopPosZ(0, 55))
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(EditInt64, quatZ, LeftPosZ(658, 34).TopPosZ(32, 19))
@ -33,7 +33,7 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
ITEM(Label, dv___31, SetLabel(t_("Focus point :")).LeftPosZ(858, 63).TopPosZ(13, 13))
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, resetPos, SetLabel(t_("Reset")).LeftPosZ(447, 45).TopPosZ(14, 15))
ITEM(Button, zoomToFit, SetLabel(t_("Fit camera")).LeftPosZ(1028, 78).TopPosZ(10, 18))
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))
@ -51,11 +51,12 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
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))
ITEM(Label, dv___52, SetLabel(t_("Translation: Shift + Wheel Click ")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1113, 148).TopPosZ(4, 19))
ITEM(Label, dv___52, SetLabel(t_("Translation: Shift + Wheel Click ")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1112, 148).TopPosZ(10, 16))
ITEM(Label, dv___53, SetLabel(t_("Rotation: Wheel Click ")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1030, 98).TopPosZ(33, 19))
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(Button, resetPos, SetLabel(t_("Reset")).LeftPosZ(447, 45).TopPosZ(14, 15))
END_LAYOUT

2
bazaar/SurfaceCtrl_Demo/SurfaceCtrl_Demo.upp
View file

@ -11,7 +11,5 @@ file
mainconfig
"" = "USEMALLOC",
"" = "USEMALLOC GUI",
"" = "GUI SKYBOX",
"" = "USEMALLOC GUI SKYBOX",
"" = "GUI";

10
bazaar/SurfaceCtrl_Demo/main.cpp
View file

@ -53,6 +53,7 @@ namespace Upp{
obj.GetTransform().SetScale(glm::vec3(1.0f,1.0f,1.0f));
obj.SetLineWidth(2.0f);
canvas.SetDefaultShader(obj);
canvas.ZoomToFit();
});
canvas.Refresh();
} catch (Exc e) {
@ -66,6 +67,7 @@ namespace Upp{
obj.LoadModel(GetFileDirectory(__FILE__) + "earth/earth.obj").AttachTexture(obj.InsertTexture(GetFileDirectory(__FILE__) + "earth/earth.png",-1,FLIP_MIRROR_VERT),0,obj.GetMeshes().GetCount()).Init();
obj.GetTransform().Rotate(-180,glm::vec3(1.0f,0.0f,0.0f));
canvas.SetDefaultShader(obj);
canvas.ZoomToFit();
});
canvas.Refresh();
} catch (Exc e) {
@ -78,6 +80,7 @@ namespace Upp{
Object3D& obj = canvas.CreateObject();
obj.LoadModel(GetFileDirectory(__FILE__) + "ultimate/upp.obj").Init();
canvas.SetDefaultShader(obj);
canvas.ZoomToFit();
});
canvas.Refresh();
} catch (Exc e) {
@ -85,6 +88,11 @@ namespace Upp{
}
};
zoomToFit.WhenAction = [&]{
canvas.ZoomToFit();
canvas.Refresh();
};
camPosX <<= THISBACK(UpdatePosition);
camPosY <<= THISBACK(UpdatePosition);
camPosZ <<= THISBACK(UpdatePosition);
@ -273,7 +281,7 @@ namespace Upp{
GUI_APP_MAIN
{
// Upp::ConsoleOutput con(true);
Upp::ConsoleOutput con(true);
Upp::StdLogSetup( Upp::LOG_COUT | Upp::LOG_FILE);
Upp::SurfaceCtrl_Demo().Run();
}