mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-06-13 22:04:36 -06:00
SurfaceCtrl_Demo: Updated to allow compatibility with GLCtrl instead of GLCtrl_glad
git-svn-id: svn://ultimatepp.org/upp/trunk@14940 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
xemuth
parent
30e223a0ba
commit
16826074cd
2 changed files with 38 additions and 36 deletions
|
|
@ -8,14 +8,14 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
|
|||
ITEM(Switch, cameraView, SetLabel(t_("Perspective view\nParallel view")).LeftPosZ(54, 184).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))
|
||||
ITEM(Option, ShowFocus, SetLabel(t_("Show Focus")).LeftPosZ(843, 77).TopPosZ(35, 16))
|
||||
ITEM(Option, ShowFocus, SetLabel(t_("Show Focus")).LeftPosZ(858, 77).TopPosZ(35, 16))
|
||||
ITEM(Option, axis, SetLabel(t_("Show axis")).LeftPosZ(364, 68).TopPosZ(35, 16))
|
||||
ITEM(Label, fov, SetLabel(t_("FOV:")).SetFont(StdFontZ(11)).LeftPosZ(246, 27).TopPosZ(33, 19))
|
||||
ITEM(EditIntSpin, fovSelector, LeftPosZ(274, 74).TopPosZ(33, 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()).LeftPosZ(444, 568).TopPosZ(0, 55))
|
||||
ITEM(Label, frontvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 74).TopPosZ(38, 13))
|
||||
ITEM(LabelBox, dv___15, SetLabel(t_("Camera values")).SetFont(StdFont().Bold()).LeftPosZ(444, 580).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))
|
||||
ITEM(EditInt64, ObjScalZ, RightPosZ(52, 40).BottomPosZ(9, 19))
|
||||
|
|
@ -24,18 +24,18 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
|
|||
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(974, 31).TopPosZ(11, 19))
|
||||
ITEM(EditInt64, focusY, LeftPosZ(941, 31).TopPosZ(11, 19))
|
||||
ITEM(EditInt64, focusX, LeftPosZ(908, 31).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(980, 24).TopPosZ(36, 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))
|
||||
ITEM(Label, dv___31, SetLabel(t_("Focus point :")).LeftPosZ(843, 63).TopPosZ(13, 13))
|
||||
ITEM(Label, rightvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 74).TopPosZ(23, 13))
|
||||
ITEM(Label, upvec, SetLabel(t_("(12, 439, 10)")).LeftPosZ(765, 74).TopPosZ(8, 13))
|
||||
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(EditInt64, quatW, LeftPosZ(550, 34).TopPosZ(32, 19))
|
||||
ITEM(TreeCtrl, AllObjects, RightPosZ(3, 249).VSizePosZ(55, 117))
|
||||
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(EditInt64, ObjQuatW, RightPosZ(115, 29).BottomPosZ(34, 19))
|
||||
|
|
@ -49,10 +49,10 @@ LAYOUT(SurfaceCtrl_DemoLayout, 1266, 475)
|
|||
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(922, 55).TopPosZ(36, 13))
|
||||
ITEM(Label, dv___51, SetLabel(t_("To Rotate around an object, \nWheel Click the object.")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1125, 126).TopPosZ(29, 24))
|
||||
ITEM(Label, dv___52, SetLabel(t_("Translation: Shift + Wheel Click ")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1015, 148).TopPosZ(8, 19))
|
||||
ITEM(Label, dv___53, SetLabel(t_("Rotation: Wheel Click ")).SetFont(StdFontZ(10).Italic()).LeftPosZ(1015, 105).TopPosZ(26, 19))
|
||||
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___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))
|
||||
|
|
|
|||
|
|
@ -39,38 +39,40 @@ namespace Upp{
|
|||
|
||||
butOpen.WhenAction = [&] {
|
||||
try {
|
||||
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
obj.LoadModel(~filename).Init();
|
||||
|
||||
obj.GetTransform().Rotate(90.0f,glm::vec3(1.0f,0.0f,0.0f));
|
||||
obj.GetTransform().SetScale(glm::vec3(1.0f,1.0f,1.0f));
|
||||
obj.SetLineWidth(2.0f);
|
||||
|
||||
canvas.SetDefaultShader(obj);
|
||||
|
||||
canvas.Refresh();
|
||||
canvas.ExecuteGL([&]{
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
obj.LoadModel(~filename).Init();
|
||||
obj.GetTransform().Rotate(90.0f,glm::vec3(1.0f,0.0f,0.0f));
|
||||
obj.GetTransform().SetScale(glm::vec3(1.0f,1.0f,1.0f));
|
||||
obj.SetLineWidth(2.0f);
|
||||
canvas.SetDefaultShader(obj);
|
||||
canvas.Refresh();
|
||||
});
|
||||
} catch (Exc e) {
|
||||
Exclamation(DeQtf(e));
|
||||
}
|
||||
};
|
||||
OpenEarth.WhenAction = [&]{
|
||||
try {
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
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.Refresh();
|
||||
canvas.ExecuteGL([&]{
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
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.Refresh();
|
||||
});
|
||||
} catch (Exc e) {
|
||||
Exclamation(DeQtf(e));
|
||||
}
|
||||
};
|
||||
Ultimate.WhenAction = [&]{
|
||||
try {
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
obj.LoadModel(GetFileDirectory(__FILE__) + "ultimate/upp.obj").Init();
|
||||
canvas.SetDefaultShader(obj);
|
||||
canvas.Refresh();
|
||||
canvas.ExecuteGL([&]{
|
||||
Object3D& obj = canvas.CreateObject();
|
||||
obj.LoadModel(GetFileDirectory(__FILE__) + "ultimate/upp.obj").Init();
|
||||
canvas.SetDefaultShader(obj);
|
||||
canvas.Refresh();
|
||||
});
|
||||
} catch (Exc e) {
|
||||
Exclamation(DeQtf(e));
|
||||
}
|
||||
|
|
@ -252,7 +254,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();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue