Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-30 03:53:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make the magicleap servo2d app 16x9 rather than square

Browse source
This commit is contained in:
Alan Jeffrey 2019-08-12 17:15:35 -05:00
parent 4709a3061d
commit db4edaee87
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
support/magicleap/Servo2D/code/src/Servo2D.cpp
View file

@ -18,22 +18,22 @@
#include <string.h>
// The viewport dimensions (in px).
const int VIEWPORT_W = 500;
const int VIEWPORT_H = 500;
const int VIEWPORT_W = 1280;
const int VIEWPORT_H = 720;
// The hidpi factor.
const float HIDPI = 1.0;
// The prism dimensions (in m).
const float PRISM_W = 0.75;
const float PRISM_H = 0.75;
const float PRISM_W = 1.50;
const float PRISM_H = 1;
const float PRISM_D = 0.05;
// The length of the laser pointer (in m).
const float LASER_LENGTH = 10.0;
// The width of the keyboard
const float KEYBOARD_W = 0.666;
const float KEYBOARD_W = 1.333;
// The home page
const char* HOME_PAGE = "https://servo.org/ml-home";
@ -152,7 +152,7 @@ int Servo2D::init() {
}
lumin::ui::UiPanel::RequestFocus(content_panel_);
lumin::ResourceIDType plane_id = prism_->createPlanarEGLResourceId();
lumin::ResourceIDType plane_id = prism_->createPlanarEGLResourceId(VIEWPORT_W, VIEWPORT_H);
if (!plane_id) {
ML_LOG(Error, "Servo2D Failed to create EGL resource");
abort();

2
support/magicleap/Servo2D/pipeline/lap/project.json
View file

@ -22,7 +22,7 @@
"lap/types/file/png"
]
},
"checkpoint-hash": "729ed9ee48ecc992e1906080e20f43fdc3f3b2a4cd76cdfc2bc249bfca1d9403b967ed1a6805b0b8c0e46a0bfd3d71c0a6a00fd7da651beef65f7431b7b314b3",
"checkpoint-hash": "ac0d99c246211709c735b6ff2a02e2f4a2450bdb04c0db28409c4990e45211b922511c68c5874869ee26898c1a95c40a812b85d4c3fa397703606f436fd84b51",
"templates": [
"lap/template/passthru_material_from_kmat",
"lap/template/passthru_model_from_fbx",

26
support/magicleap/Servo2D/scenes/Servo2D.design
View file

@ -16,8 +16,8 @@
<property id="name" value="contentPanel"/>
<property id="panelShape">
<property id="size">
<property id="x" value="0.5"/>
<property id="y" value="0.44"/>
<property id="x" value="1.28"/>
<property id="y" value="0.72"/>
</property>
<property id="offset"/>
</property>
@ -30,15 +30,15 @@
<property id="external" value="true"/>
<property id="name" value="content"/>
<property id="position">
<property id="x" value="-0.25"/>
<property id="y" value="-0.22"/>
<property id="x" value="-0.64"/>
<property id="y" value="-0.36"/>
<property id="z" value="-0.0"/>
</property>
<property id="rotation"/>
<property id="scale"/>
<property id="size">
<property id="x" value="0.5"/>
<property id="y" value="0.5"/>
<property id="x" value="1.28"/>
<property id="y" value="0.72"/>
</property>
<property id="texCoords">
<property id="x">
@ -77,12 +77,12 @@
<property id="name" value="uiLinearLayout1"/>
<property id="orientation" value="Horizontal"/>
<property id="position">
<property id="y" value="-0.2"/>
<property id="y" value="-0.32"/>
</property>
<property id="rotation"/>
<property id="scale"/>
<property id="size">
<property id="x" value="0.5"/>
<property id="x" value="1.28"/>
<property id="y" value="0.05"/>
</property>
<node name="backButton" nodeTypeId="lumin.ui.button">
@ -150,22 +150,22 @@
<property id="left" value="0.003"/>
</property>
<property id="textSize" value="0.05"/>
<property id="width" value="0.6"/>
<property id="width" value="1.8"/>
</node>
</node>
<node name="bevel" nodeTypeId="lumin.quad">
<property id="color" value="0.4 0.302 0.702 1"/>
<property id="name" value="bevel"/>
<property id="position">
<property id="x" value="-0.26"/>
<property id="y" value="-0.17"/>
<property id="x" value="-0.65"/>
<property id="y" value="-0.31"/>
<property id="z" value="-0.01"/>
</property>
<property id="rotation"/>
<property id="scale"/>
<property id="size">
<property id="x" value="0.52"/>
<property id="y" value="0.52"/>
<property id="x" value="1.3"/>
<property id="y" value="0.74"/>
</property>
<property id="texCoords">
<property id="x">

10
support/magicleap/Servo2D/scenes/Servo2D.scene.xml
View file

@ -1,9 +1,9 @@
<ObjectModel name="Servo2D" version="1">
<TransformNode/>
<UiPanel bottomEdgeConstraint="0.000000" cursorVisible="false" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" leftEdgeConstraint="0.000000" name="contentPanel" pos="0,0.06,0" rightEdgeConstraint="0.000000" shape="[size:[0.5,0.44], roundness: 0, offset:[0,0,0]]" topEdgeConstraint="0.000000">
<QuadNode castShadow="false" name="content" pos="-0.25,-0.22,-0" receiveShadow="false" shader="MAX" size="0.500000, 0.500000"/>
<UiPanel bottomEdgeConstraint="0.000000" cursorVisible="false" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" leftEdgeConstraint="0.000000" name="contentPanel" pos="0,0.06,0" rightEdgeConstraint="0.000000" shape="[size:[1.28,0.72], roundness: 0, offset:[0,0,0]]" topEdgeConstraint="0.000000">
<QuadNode castShadow="false" name="content" pos="-0.64,-0.36,-0" receiveShadow="false" shader="MAX" size="1.280000, 0.720000"/>
</UiPanel>
<UiLinearLayout alignment="Top, Center" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" itemAlignment="Center, Left" itemPadding="0.000000, 0.010000, 0.000000, 0.010000" name="uiLinearLayout1" orientation="Horizontal" pos="0,-0.2,0" size="0.500000, 0.050000">
<UiLinearLayout alignment="Top, Center" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" itemAlignment="Center, Left" itemPadding="0.000000, 0.010000, 0.000000, 0.010000" name="uiLinearLayout1" orientation="Horizontal" pos="0,-0.32,0" size="1.280000, 0.050000">
<Content>
<UiButton gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" name="backButton" pos="0,-0.6,0" size="0.100000, 0.100000" text="Back" textSize="0.050000"/>
</Content>
@ -11,8 +11,8 @@
<UiButton gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" name="fwdButton" size="0.100000, 0.100000" text="Fwd" textSize="0.050000"/>
</Content>
<Content>
<UiTextEdit alignment="Center, Left" font="DefaultRes_Font_LominoUI_Rg" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" name="urlBar" scrollSpeed="0.500000" size="0.600000, 0.050000" textSize="0.050000"/>
<UiTextEdit alignment="Center, Left" font="DefaultRes_Font_LominoUI_Rg" gravityWellRoundness="0.000000" gravityWellSize="0.000000, 0.000000" gravityWellSnap="ClosestEdge" name="urlBar" scrollSpeed="0.500000" size="1.800000, 0.050000" textSize="0.050000"/>
</Content>
</UiLinearLayout>
<QuadNode castShadow="false" color="0.1572062,0.09219654,0.4817875,1" name="bevel" pos="-0.26,-0.17,-0.01" receiveShadow="false" shader="MAX" size="0.520000, 0.520000"/>
<QuadNode castShadow="false" color="0.1572062,0.09219654,0.4817875,1" name="bevel" pos="-0.65,-0.31,-0.01" receiveShadow="false" shader="MAX" size="1.300000, 0.740000"/>
</ObjectModel>