More UI and IDE fixes

Core/Contents/Include/PolyEntity.h

@@ -698,7 +698,8 @@ namespace Polycode {
 			bool blockMouseInput;
 																					
 			void setHitbox(Number width, Number height) {}
-			Vector2 getScreenPosition() const { return Vector2(); }
+			Vector2 getScreenPosition(Matrix4 projectionMatrix, Matrix4 cameraMatrix);
+			Vector2 getScreenPositionForMainCamera();
 
 			bool hitTest(Number x, Number y) const { return false; }
 			bool hitTest(Vector2 v) const { return false; }

Core/Contents/Include/PolyGLRenderer.h

@@ -121,6 +121,8 @@ namespace Polycode {
 		void bindFrameBufferTextureDepth(Texture *texture);		
 		void unbindFramebuffers();
 		
+		Vector2 Project(const Matrix4 &cameraMatrix, const Matrix4 &projectionMatrix, const Vector3 &coordiante) const;
+		
 		void cullFrontFaces(bool val);
 				
 		void pushRenderDataArray(RenderDataArray *array);

Core/Contents/Include/PolyRenderer.h

@@ -241,6 +241,8 @@ namespace Polycode {
 		
 		virtual Vector3 projectRayFrom2DCoordinate(Number x, Number y, Matrix4 cameraMatrix, Matrix4 projectionMatrix) = 0;
 		
+		virtual Vector2 Project(const Matrix4 &cameraMatrix, const Matrix4 &projectionMatrix, const Vector3 &coordiante) const = 0;
+		
 		void enableShaders(bool flag);
 		
 		Number getViewportWidth();

Core/Contents/Include/PolySceneLabel.h

@@ -66,6 +66,8 @@ namespace Polycode {
 			
 			bool positionAtBaseline;
 			
+			static Vector3 defaultAnchor;
+			
 		protected:
 			
 			void updateFromLabel();

Core/Contents/Source/PolyEntity.cpp

@@ -411,6 +411,14 @@ Matrix4 Entity::getConcatenatedRollMatrix() const {
 		return transformMatrix;	
 }
 
+Vector2 Entity::getScreenPosition(Matrix4 projectionMatrix, Matrix4 cameraMatrix) {
+	Vector2 pos = renderer->Project(cameraMatrix, projectionMatrix, getConcatenatedMatrix().getPosition());
+	return pos;
+}
+
+Vector2 Entity::getScreenPositionForMainCamera() {
+	return getScreenPosition(renderer->getProjectionMatrix(), renderer->getCameraMatrix());
+}
 
 void Entity::transformAndRender() {
 	if(!renderer || !enabled)
@@ -869,7 +877,7 @@ MouseEventResult Entity::onMouseDown(const Ray &ray, int mouseButton, int timest
 			}
 		}
 		
-		for(int i=0; i < children.size(); i++) {
+		for(int i=children.size()-1; i>=0; i--) {
 			MouseEventResult childRes = children[i]->onMouseDown(ray, mouseButton, timestamp);
 				if(childRes.hit)
 					ret.hit = true;
@@ -905,7 +913,7 @@ MouseEventResult Entity::onMouseUp(const Ray &ray, int mouseButton, int timestam
 			dispatchEvent(new InputEvent(Vector2(localCoordinate.x, localCoordinate.y), timestamp), InputEvent::EVENT_MOUSEUP_OUTSIDE);
 		}
 		
-		for(int i=0; i < children.size(); i++) {
+		for(int i=children.size()-1; i>=0; i--) {
 			MouseEventResult childRes = children[i]->onMouseUp(ray, mouseButton, timestamp);
 				if(childRes.hit)
 					ret.hit = true;
@@ -930,6 +938,7 @@ MouseEventResult Entity::onMouseMove(const Ray &ray, int timestamp) {
 		localCoordinate = inverse * localCoordinate;	
 	
 		if(ray.boxIntersect(bBox, getAnchorAdjustedMatrix())) {	
+			//setColor(1.0, 0.0, 0.0, 1.0);
 			ret.hit = true;			
 			dispatchEvent(new InputEvent(Vector2(localCoordinate.x, localCoordinate.y), timestamp), InputEvent::EVENT_MOUSEMOVE);
 			
@@ -948,7 +957,7 @@ MouseEventResult Entity::onMouseMove(const Ray &ray, int timestamp) {
 			}		
 		}
 		
-		for(int i=0; i < children.size(); i++) {
+		for(int i=children.size()-1; i>=0; i--) {
 			MouseEventResult childRes = children[i]->onMouseMove(ray, timestamp);
 				if(childRes.hit)
 					ret.hit = true;

Core/Contents/Source/PolyGLRenderer.cpp

@@ -249,8 +249,34 @@ Vector3 OpenGLRenderer::Unproject(Number x, Number y) {
 	
 	coords = Vector3( cx, cy, cz );
 	
-	return coords;
+	return coords;	
+}
+
+Vector2 OpenGLRenderer::Project(const Matrix4 &cameraMatrix, const Matrix4 &projectionMatrix, const Vector3 &coordiante) const {
+	
+	GLdouble mv[16];
+	Matrix4 camInverse = cameraMatrix.Inverse();	
+	Matrix4 cmv;
+	cmv.identity();
+	cmv = cmv * camInverse;
+
+	GLint vp[4];
+	glGetIntegerv( GL_VIEWPORT, vp );
+
+	for(int i=0; i < 16; i++) {
+		mv[i] = cmv.ml[i];
+	}
+
+	GLdouble _sceneProjectionMatrix[16];
+	for(int i=0; i < 16; i++) {
+		_sceneProjectionMatrix[i] = projectionMatrix.ml[i];
+	}	
+
+	GLdouble coords[3];
+	
+	gluProject(coordiante.x, coordiante.y, coordiante.z, mv, _sceneProjectionMatrix, vp, &coords[0], &coords[1], &coords[2]);
 	
+	return Vector2(coords[0], yRes-coords[1]);
 }
 
 Vector3 OpenGLRenderer::projectRayFrom2DCoordinate(Number x, Number y, Matrix4 cameraMatrix, Matrix4 projectionMatrix) {

Core/Contents/Source/PolyRay.cpp

@@ -44,6 +44,9 @@ Ray Ray::tranformByMatrix(const Matrix4& matrix) const {
 
 bool Ray::boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near, float far) const {	
 
+	if(box.x == 0 || box.y == 0 || box.z == 0)
+		return false;
+
 	Ray r  = tranformByMatrix(transformMatrix.Inverse());
 
 	Vector3 bounds[2];

Core/Contents/Source/PolyScene.cpp

@@ -162,8 +162,7 @@ Camera *Scene::getDefaultCamera() {
 	return defaultCamera;
 }
 
-void Scene::Render(Camera *targetCamera) {
-	
+void Scene::Render(Camera *targetCamera) {	
 	if(!targetCamera && !activeCamera)
 		return;
 	
@@ -247,8 +246,7 @@ void Scene::Render(Camera *targetCamera) {
 	
 	if(targetCamera->getOrthoMode()) {
 		CoreServices::getInstance()->getRenderer()->setPerspectiveMode();
-	}
-	
+	}	
 }
 
 

Core/Contents/Source/PolySceneLabel.cpp

@@ -31,10 +31,13 @@
 
 using namespace Polycode;
 
+Vector3 SceneLabel::defaultAnchor = Vector3();
+
 SceneLabel::SceneLabel(const String& fontName, const String& text, int size, Number scale, int amode, bool premultiplyAlpha) : ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 1, 1) {
 	label = new Label(CoreServices::getInstance()->getFontManager()->getFontByName(fontName), text, size, amode, premultiplyAlpha);
 	this->labelScale = scale;
 	positionAtBaseline = false;
+	setAnchorPoint(SceneLabel::defaultAnchor);
 	updateFromLabel();
 }
 
@@ -43,6 +46,7 @@ SceneLabel::SceneLabel(const String& text, int size, const String& fontName, int
 	label = new Label(CoreServices::getInstance()->getFontManager()->getFontByName(fontName), text, size, amode, premultiplyAlpha);
 	this->labelScale = 1.0;
 	positionAtBaseline = false;
+	setAnchorPoint(SceneLabel::defaultAnchor);	
 	updateFromLabel();
 }
 			

IDE/Contents/Source/PolycodeConsole.cpp

@@ -343,6 +343,8 @@ void PolycodeConsole::_print(String msg) {
 }
 
 void PolycodeConsole::Resize(Number width, Number height) {
-	backtraceSizer->Resize(getWidth(), getHeight());
+	setWidth(width);
+	setHeight(height);	
+	backtraceSizer->Resize(width, height);
 	backtraceSizer->setPosition(0, 0);
 }

IDE/Contents/Source/PolycodeEditor.cpp

@@ -46,7 +46,7 @@ void PolycodeEditor::setFilePath(String newPath) {
 
 PolycodeEditor::PolycodeEditor(bool _isReadOnly) : UIElement(), ClipboardProvider() {
 	this->_isReadOnly = _isReadOnly;
-	enableScissor = true;	
+//	enableScissor = true;	
 	processInputEvents = true;
 	_hasChanges = false;
 	
@@ -149,7 +149,7 @@ void PolycodeEditor::didAction(String actionName, PolycodeEditorActionData *befo
 
 void PolycodeEditor::Resize(int x, int y) {
 	editorSize = Vector2(x,y);
-	Vector2 pos = getScreenPosition();
+	Vector2 pos = getScreenPositionForMainCamera();
 	scissorBox.setRect(pos.x,pos.y, x, y);	
 }
 

IDE/Contents/Source/PolycodeFrame.cpp

@@ -548,7 +548,7 @@ PolycodeFrame::PolycodeFrame() : UIElement() {
 	topBarBg->blockMouseInput = true;
 	addChild(topBarBg);
 	
-	logo = new UIImage("Images/barlogo.png");	
+	logo = new UIImage("Images/barlogo.png");
 	addChild(logo);		
 	
 	
@@ -741,7 +741,7 @@ void PolycodeFrame::showEditor(PolycodeEditor *editor) {
 	
 	editorHolder->currentEditor = editor;
 	editorHolder->currentEditor->enabled = true;
-	editorHolder->currentEditor->Activate();
+	editorHolder->currentEditor->Activate();	
 	
 	Resize(frameSizeX, frameSizeY);
 }
@@ -925,7 +925,7 @@ void PolycodeFrame::Resize(int x, int y) {
 		(y-welcomeImage->getHeight()) / 2); 
 	
 	topBarBg->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, x, 45);
-	logo->setPosition(x-logo->getWidth()-2, 2);	
+	logo->setPosition(x-logo->getWidth()-2, 2);
 	resizer->setPosition(x-resizer->getWidth()-1, y-resizer->getHeight()-1);	
 	mainSizer->Resize(x,y-45);	
 	

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -71,6 +71,8 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	
 	willRunProject = false;
 
+	SceneLabel::defaultAnchor = Vector3(-1.0, -1.0, 0.0);
+
 	globalMenu	= new UIGlobalMenu();
 	UITextInput::setMenuSingleton(globalMenu);
 			

IDE/Contents/Source/PolycodeMaterialEditor.cpp

@@ -982,7 +982,7 @@ MaterialMainWindow::MaterialMainWindow() : UIElement() {
 }
 	
 void MaterialMainWindow::Resize(Number width, Number height) {	
-	Vector2 pos = getScreenPosition();	
+	Vector2 pos = getScreenPositionForMainCamera();	
 	scissorBox.setRect(pos.x,pos.y,width, height);
 	materialPane->Resize(getWidth(), getHeight());
 	shaderPane->Resize(getWidth(), getHeight());

Modules/Contents/UI/Source/PolyUIBox.cpp

@@ -36,54 +36,73 @@ UIBox::UIBox(String imageFile, Number t, Number r, Number b, Number l, Number bo
 	tlImage->setImageCoordinates(0,0,l,t);
 	addChild(tlImage);
 	tlImage->setPosition(0, 0);
+	tlImage->depthTest = false;
+	tlImage->depthWrite = false;	
 	
 	trImage = new SceneImage(imageFile);
 	trImage->setAnchorPoint(-1.0, -1.0, 0.0);
 	trImage->setImageCoordinates(trImage->getWidth()-r,0,r,t);
 	addChild(trImage);	
 	trImage->setPosition(boxWidth-r, 0);
+	trImage->depthTest = false;
+	trImage->depthWrite = false;	
+
 
 	blImage = new SceneImage(imageFile);
 	blImage->setAnchorPoint(-1.0, -1.0, 0.0);	
 	blImage->setImageCoordinates(0,blImage->getHeight()-b,l,b);
 	addChild(blImage);	
 	blImage->setPosition(0, boxHeight-b);
+	blImage->depthTest = false;
+	blImage->depthWrite = false;	
 
 	brImage = new SceneImage(imageFile);
 	brImage->setAnchorPoint(-1.0, -1.0, 0.0);
 	brImage->setImageCoordinates(brImage->getWidth()-r,brImage->getHeight()-b,r,b);
 	addChild(brImage);	
 	brImage->setPosition(boxWidth-r, boxHeight-b);	
+	brImage->depthTest = false;
+	brImage->depthWrite = false;	
 	
 	centerImage = new SceneImage(imageFile);
 	centerImage->setAnchorPoint(-1.0, -1.0, 0.0);
 	centerImage->setImageCoordinates(l,t,centerImage->getWidth()-l-r, centerImage->getHeight()-t-b, boxWidth-l-r, boxHeight-t-b);
 	addChild(centerImage);	
 	centerImage->setPosition(l,t);	
+	centerImage->depthTest = false;
+	centerImage->depthWrite = false;	
 	
 	tImage = new SceneImage(imageFile);
 	tImage->setAnchorPoint(-1.0, -1.0, 0.0);
 	tImage->setImageCoordinates(l,0,tImage->getWidth()-l-r,t, boxWidth-l-r, t);
 	addChild(tImage);
 	tImage->setPosition(l,0);	
+	tImage->depthTest = false;
+	tImage->depthWrite = false;	
 
 	bImage = new SceneImage(imageFile);
 	bImage->setAnchorPoint(-1.0, -1.0, 0.0);	
 	bImage->setImageCoordinates(l,bImage->getHeight()-b,bImage->getWidth()-l-r,b, boxWidth-l-r, b);
 	addChild(bImage);
 	bImage->setPosition(l,boxHeight-b);	
+	bImage->depthTest = false;
+	bImage->depthWrite = false;	
 
 	lImage = new SceneImage(imageFile);
 	lImage->setAnchorPoint(-1.0, -1.0, 0.0);		
 	lImage->setImageCoordinates(0,t,l,lImage->getHeight()-t-b, l, boxHeight-t-b);
 	addChild(lImage);
 	lImage->setPosition(0,t);	
+	lImage->depthTest = false;
+	lImage->depthWrite = false;	
 
 	rImage = new SceneImage(imageFile);
 	rImage->setAnchorPoint(-1.0, -1.0, 0.0);		
 	rImage->setImageCoordinates(rImage->getWidth()-r,t,r,rImage->getHeight()-t-b, r, boxHeight-t-b);
 	addChild(rImage);
 	rImage->setPosition(boxWidth-r,t);	
+	rImage->depthTest = false;
+	rImage->depthWrite = false;	
 	
 	this->t = t;
 	this->r = r;
@@ -94,23 +113,23 @@ UIBox::UIBox(String imageFile, Number t, Number r, Number b, Number l, Number bo
 }
 
 void UIBox::resizeBox(Number newWidth, Number newHeight) {
+
+	setWidth(newWidth);
+	setHeight(newHeight);
+
 	brImage->setPosition(newWidth-brImage->getWidth(), newHeight-brImage->getHeight());
 	trImage->setPosition(newWidth-trImage->getWidth(), 0);
 	blImage->setPosition(0, newHeight-blImage->getHeight());
 	
-	centerImage->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, newWidth-l-r, newHeight-t-b);
-		
-	lImage->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, l, newHeight-t-b);	
-	rImage->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, r, newHeight-t-b);		
-	bImage->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, newWidth-l-r, b);
-	tImage->setPrimitiveOptions(ScenePrimitive::TYPE_VPLANE, newWidth-l-r, t);	
+	centerImage->setImageCoordinates(l,t,centerImage->getImageWidth()-l-r, centerImage->getImageHeight()-t-b, newWidth-l-r, newHeight-t-b);
+	lImage->setImageCoordinates(0,t,l,lImage->getImageHeight()-t-b, l, newHeight-t-b);
+	rImage->setImageCoordinates(rImage->getImageWidth()-r,t,r,rImage->getImageHeight()-t-b, r, newHeight-t-b);
+	bImage->setImageCoordinates(l,bImage->getImageHeight()-b,bImage->getImageWidth()-l-r,b, newWidth-l-r, b);
+	tImage->setImageCoordinates(l,0,tImage->getImageWidth()-l-r,t, newWidth-l-r, t);	
 	
 	bImage->setPosition(bImage->getPosition().x, newHeight-bImage->getHeight());	
 	rImage->setPosition(newWidth-rImage->getWidth(),rImage->getPosition().y);
-	
-	setWidth(newWidth);
-	setHeight(newHeight);
-	
+		
 	this->rebuildTransformMatrix();
 }
 

Modules/Contents/UI/Source/PolyUIComboBox.cpp

@@ -144,7 +144,7 @@ UIComboBoxItem *UIComboBox::getSelectedItem() {
 }
 
 void UIComboBox::toggleDropDown() {
-	Vector2 screenPos = this->getScreenPosition();
+	Vector2 screenPos = this->getScreenPositionForMainCamera();
 	dropDownMenu = globalMenu->showMenu(screenPos.x, screenPos.y, getWidth());
 	
 	for(int i=0; i < items.size(); i++) {

Modules/Contents/UI/Source/PolyUIElement.cpp

@@ -26,6 +26,9 @@ using namespace Polycode;
 
 UIImage::UIImage(String imagePath) : UIElement() {
 	image = new SceneImage(imagePath);
+	image->setAnchorPoint(-1.0, -1.0, 0.0);
+	image->depthTest = false;
+	image->depthWrite = false;		
 	addChild(image);
 	setWidth(image->bBox.x);
 	setHeight(image->bBox.y);	
@@ -43,7 +46,9 @@ UIElement::UIElement() : Entity() {
 	focusable = false;
 	focusParent = NULL;
 	hasDragLimits = false;
-	dragged = false;	
+	dragged = false;
+	depthTest = false;
+	depthWrite = false;			
 }
 
 UIElement::UIElement(Number width, Number height) : Entity() {
@@ -52,6 +57,8 @@ UIElement::UIElement(Number width, Number height) : Entity() {
 	focusParent = NULL;
 	hasDragLimits = false;	
 	dragged = false;	
+	depthTest = false;
+	depthWrite = false;		
 	setWidth(width);
 	setHeight(height);
 }

Modules/Contents/UI/Source/PolyUIMenu.cpp

@@ -168,7 +168,7 @@ void UIMenu::fitToScreenVertical() {
 	// Make sure the entity doesn't go past the bottom of the screen.
 	if(dropDownBox->getHeight() < CoreServices::getInstance()->getCore()->getYRes()) {
 		// If the entity is as high as the screen, no point trying to fit it in vertically.
-		Vector2 screenPos = this->getScreenPosition();
+		Vector2 screenPos = this->getScreenPositionForMainCamera();
 		Number exceedScreenBottom = screenPos.y + dropDownBox->getHeight() - CoreServices::getInstance()->getCore()->getYRes();
 		if(exceedScreenBottom > 0) {
 			this->setPosition(this->getPosition().x, this->getPosition().y - exceedScreenBottom);

Modules/Contents/UI/Source/PolyUIScrollContainer.cpp

@@ -163,7 +163,7 @@ void UIScrollContainer::scrollHorizontal(Number amount) {
 
 
 void UIScrollContainer::Update() {
-	Vector2 pos = getScreenPosition();
+	Vector2 pos = getScreenPositionForMainCamera();
 	scissorBox.setRect(pos.x, pos.y, getWidth(), getHeight());
 }
 

Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -2148,7 +2148,7 @@ void UITextInput::Update() {
 	}
 	linesToDelete.clear();
 
-	textContainer->scissorBox.setRect(textContainer->getScreenPosition().x, textContainer->getScreenPosition().y, textContainer->getWidth(), textContainer->getHeight() + padding);
+	textContainer->scissorBox.setRect(textContainer->getScreenPositionForMainCamera().x, textContainer->getScreenPositionForMainCamera().y, textContainer->getWidth(), textContainer->getHeight() + padding);
 }
 
 UITextInput::~UITextInput() {

Modules/Contents/UI/Source/PolyUITree.cpp

@@ -79,9 +79,10 @@ UITree::UITree(String icon, String text, Number treeWidth, Number treeOffset) :
 	selection->visible = false;
 	addChild(selection);
 	arrowIconImage = new SceneImage(arrowIcon.c_str());
-	arrowIconImage->setPosition(cellPadding,(cellHeight-arrowIconImage->getHeight())/2.0f);
+	arrowIconImage->setPosition(cellPadding + arrowIconImage->getWidth()/2.0,(cellHeight)/2.0f);	
 	addChild(arrowIconImage);
 	iconImage = new SceneImage(icon.c_str());
+	iconImage->setAnchorPoint(-1.0, -1.0, 0.0);
 	addChild(iconImage);
 	iconImage->setPosition(arrowIconImage->getWidth()+(cellPadding*2),(cellHeight-iconImage->getHeight())/2.0f);
 
@@ -95,8 +96,7 @@ UITree::UITree(String icon, String text, Number treeWidth, Number treeOffset) :
 	parent = NULL;
 	selectedNode = NULL;
 	arrowIconImage->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
-	arrowIconImage->processInputEvents = true;
-	
+	arrowIconImage->processInputEvents = true;	
 	
 	bgBox->addEventListener(this, InputEvent::EVENT_MOUSEUP);
 	bgBox->addEventListener(this, InputEvent::EVENT_MOUSEUP_OUTSIDE);	
@@ -308,7 +308,7 @@ void UITree::clearTree() {
 }
 
 void UITree::Update() {
-	arrowIconImage->setRoll(handleRotation);
+	arrowIconImage->setRoll(-handleRotation);
 	if(treeChildren.size() > 0)
 		arrowIconImage->visible = true;
 	else

Modules/Contents/UI/Source/PolyUITreeContainer.cpp

@@ -82,6 +82,8 @@ void UITreeContainer::Resize(Number width, Number height) {
 //	width = x;
 	//	height = y;
 	setHitbox(width, height);
+	setWidth(width);
+	setHeight(height);
 }
 
 void UITreeContainer::handleEvent(Event *event) {
@@ -239,7 +241,7 @@ void UITreeContainer::onKeyDown(PolyKEY key, wchar_t charCode) {
 
 void UITreeContainer::scrollToNode(UITree *node, bool showAtTop) {
 	
-	Number nodeY = node->getScreenPosition().y - getRootNode()->getScreenPosition().y;
+	Number nodeY = node->getScreenPositionForMainCamera().y - getRootNode()->getScreenPositionForMainCamera().y;
 	Number contentHeight = mainContainer->getContentSize().y;
 	Number scrollHeight = contentHeight - mainContainer->getHeight();
 	Number viewTop = (contentHeight - mainContainer->getHeight()) * mainContainer->getVScrollBar()->getScrollValue();