Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add coordinate tool to Play Lab #13960

Merged
merged 4 commits into from Mar 23, 2017
Merged

Add coordinate tool to Play Lab #13960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa5c8fa
Add coordinate tool to Play Lab
joshlory Mar 23, 2017
568f0f5
Only show coordinates on Play Lab levels w/ `studio_setSpriteXY` block
joshlory Mar 23, 2017
3b2bf90
Fix HoundCI warning
joshlory Mar 23, 2017
735d30b
Defend against null `level.toolbox`
joshlory Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/src/redux/pageConstants.js
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ var ALLOWED_KEYS = new Set([
'isMinecraft',
'visualizationHasPadding',
'visualizationInWorkspace',
'hideCoordinateOverlay',
'hideSource',
'hideRunButton',
'playspacePhoneFrame',
Expand Down
10 changes: 10 additions & 0 deletions apps/src/studio/StudioVisualizationColumn.jsx
View file
Open in desktop
Expand Up @@ -5,12 +5,22 @@ var GameButtons = require('../templates/GameButtons').default;
var ArrowButtons = require('../templates/ArrowButtons');
var BelowVisualization = require('../templates/BelowVisualization');
import ProtectedVisualizationDiv from '../templates/ProtectedVisualizationDiv';
import VisualizationOverlay from '../templates/VisualizationOverlay';
import CrosshairOverlay from '../templates/CrosshairOverlay';
import TooltipOverlay, {coordinatesProvider} from '../templates/TooltipOverlay';

var StudioVisualizationColumn = function (props) {
return (
<span>
<ProtectedVisualizationDiv>
<svg version="1.1" id="svgStudio"/>
<VisualizationOverlay
width={400}
height={400}
>
<CrosshairOverlay/>
<TooltipOverlay providers={[coordinatesProvider()]}/>
</VisualizationOverlay>
</ProtectedVisualizationDiv>
<GameButtons>
<ArrowButtons/>
Expand Down
4 changes: 3 additions & 1 deletion apps/src/studio/studio.js
View file
Open in desktop
Expand Up @@ -1994,7 +1994,9 @@ Studio.init = function (config) {
}
};

studioApp.setPageConstants(config);
studioApp.setPageConstants(config, {
hideCoordinateOverlay: !level.toolbox || !level.toolbox.match(/studio_setSpriteXY/)
});

var visualizationColumn = (
<StudioVisualizationColumn
Expand Down
3 changes: 2 additions & 1 deletion apps/src/templates/VisualizationOverlay.jsx
View file
Open in desktop
Expand Up @@ -116,5 +116,6 @@ export default connect((state) => ({
}))(VisualizationOverlay);

export function shouldOverlaysBeVisible(state) {
return !(state.runState.isRunning || state.pageConstants.isShareView);
return !state.pageConstants.hideCoordinateOverlay &&
!(state.runState.isRunning || state.pageConstants.isShareView);
}
1 change: 1 addition & 0 deletions apps/style/studio/style.scss
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ $root: '/blockly/media/studio/'; //TODO: Parameterize for asset pipeline

@import 'font';
@import 'color';
@import '../VisualizationOverlay';

#svgStudio {
overflow: hidden;
Expand Down
17 changes: 17 additions & 0 deletions dashboard/config/scripts/levels/New Play Lab Project.level
View file
Open in desktop
Expand Up @@ -284,6 +284,23 @@
</block>
</value>
</block>
<block type="studio_setSpriteXY" inline="true">
<value name="SPRITE">
<block type="math_number">
<title name="NUM">1</title>
</block>
</value>
<value name="XPOS">
<block type="math_number">
<title name="NUM">200</title>
</block>
</value>
<value name="YPOS">
<block type="math_number">
<title name="NUM">200</title>
</block>
</value>
</block>
<block type="studio_setMap">
<title name="VALUE">random</title>
</block>
Expand Down