Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 01:40:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed marketplace icon from edit menu

Browse source
This commit is contained in:
ericrius1 2016-01-08 16:22:10 -08:00
parent b3f19ef4d6
commit 7e7424ec2b
2 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
examples/edit.js
View file

@ -183,8 +183,7 @@ var toolBar = (function() {
newTextButton, newTextButton,
newWebButton, newWebButton,
newZoneButton, newZoneButton,
newPolyVoxButton, newPolyVoxButton;
browseMarketplaceButton;
function initialize() { function initialize() {
toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) { toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) {
@ -194,13 +193,7 @@ var toolBar = (function() {
}; };
}); });
browseMarketplaceButton = toolBar.addTool({
imageURL: toolIconUrl + "marketplace.svg",
width: toolWidth,
height: toolHeight,
alpha: 0.9,
visible: true,
});
activeButton = toolBar.addTool({ activeButton = toolBar.addTool({
imageURL: toolIconUrl + "edit-status.svg", imageURL: toolIconUrl + "edit-status.svg",
@ -415,7 +408,6 @@ var toolBar = (function() {
} }
var newModelButtonDown = false; var newModelButtonDown = false;
var browseMarketplaceButtonDown = false;
that.mousePressEvent = function(event) { that.mousePressEvent = function(event) {
var clickedOverlay, var clickedOverlay,
url, url,
@ -443,11 +435,7 @@ var toolBar = (function() {
return true; return true;
} }
if (browseMarketplaceButton === toolBar.clicked(clickedOverlay)) {
toggleMarketplace();
return true;
}
if (newCubeButton === toolBar.clicked(clickedOverlay)) { if (newCubeButton === toolBar.clicked(clickedOverlay)) {
createNewEntity({ createNewEntity({
type: "Box", type: "Box",
@ -652,22 +640,10 @@ var toolBar = (function() {
} }
handled = true; handled = true;
} }
} else if (browseMarketplaceButtonDown) {
var clickedOverlay = Overlays.getOverlayAtPoint({
x: event.x,
y: event.y
});
if (browseMarketplaceButton === toolBar.clicked(clickedOverlay)) {
url = Window.s3Browse(".*(fbx|FBX|obj|OBJ)");
if (url !== null && url !== "") {
addModel(url);
}
handled = true;
}
} }
newModelButtonDown = false; newModelButtonDown = false;
browseMarketplaceButtonDown = false;
return handled; return handled;
} }

6
examples/marketplace.js
View file

@ -48,10 +48,10 @@ var toolBar = (function() {
browseMarketplaceButton; browseMarketplaceButton;
function initialize() { function initialize() {
toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.edit.toolbar", function(windowDimensions, toolbar) { toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "", function(windowDimensions, toolbar) {
return { return {
x: windowDimensions.x - 100 - toolbar.width, x: windowDimensions.x - 8 - toolbar.width,
y: (windowDimensions.y - toolbar.height) / 2 y: 150
}; };
}); });
browseMarketplaceButton = toolBar.addTool({ browseMarketplaceButton = toolBar.addTool({