more

Author: dimitre

libs/openFrameworks/app/ofAppGLFWWindow.cpp

@@ -50,7 +50,6 @@ ofAppGLFWWindow::ofAppGLFWWindow() : coreEvents(new ofCoreEvents){
 
 	ofAppPtr = nullptr;
 
-	pixelScreenCoordScale = 1;
 	nFramesSinceWindowResized = 0;
 	iconSet = false;
 	windowP = nullptr;
@@ -467,10 +466,9 @@ void ofAppGLFWWindow::setWindowTitle(const std::string & title) {
 
 //------------------------------------------------------------
 int ofAppGLFWWindow::getPixelScreenCoordScale() {
-
-	// TODO:
-	// discover which monitor this window
-	return pixelScreenCoordScale;
+	glm::vec2 contentScale;
+	glfwGetWindowContentScale(windowP, &contentScale.x, &contentScale.y);
+	return contentScale.x;
 }
 
 //------------------------------------------------------------
@@ -491,8 +489,11 @@ glm::ivec2 ofAppGLFWWindow::getWindowSize() {
 
 //------------------------------------------------------------
 glm::ivec2 ofAppGLFWWindow::getFramebufferSize() {
+	
 	glm::ivec2 size;
 	glfwGetFramebufferSize(windowP, &size.x, &size.y);
+	cout << "getFramebufferSize " << size << endl;
+	
 	return size;
 }
 
@@ -1047,13 +1048,14 @@ void ofAppGLFWWindow::motion_cb(GLFWwindow * windowP_, double x, double y) {
 		action = ofMouseEventArgs::Dragged;
 	}
 
-	// FIXME: ok, pixelScrenCoordScale nao ta funcionando legal. mas da pra corrigir legal em breve
-	cout << "motion_cb " << x << " : " << (x * instance->pixelScreenCoordScale)<< endl;
+	glm::vec2 contentScale;
+	glfwGetWindowContentScale(windowP_, &contentScale.x, &contentScale.y);
+	
 	ofMouseEventArgs args(action,
-		x * instance->pixelScreenCoordScale,
-		y * instance->pixelScreenCoordScale,
-//						  x ,
-//						  y ,
+//		x * contentScale.x,
+//		y * contentScale.y,
+						  x ,
+						  y ,
 		instance->buttonInUse,
 		instance->events().getModifiers());
 	instance->events().notifyMouseEvent(args);

libs/openFrameworks/app/ofAppGLFWWindow.h

@@ -73,6 +73,7 @@ class ofAppGLFWWindow : public ofAppBaseWindow {
 	void setClipboardString(const std::string & text);
 	std::string getClipboardString();
 
+	// FIXME: int? does it float?
 	int getPixelScreenCoordScale();
 
 	void makeCurrent();
@@ -151,9 +152,6 @@ class ofAppGLFWWindow : public ofAppBaseWindow {
 
 	bool bEnableSetupScreen;
 
-	// FIXME remove
-	float pixelScreenCoordScale; /// Scale factor from virtual operating-system defined client area extents (as seen in currentW, currentH) to physical framebuffer pixel coordinates (as seen in windowW, windowH).
-
 	ofRectangle windowRect { 20, 20, 800, 600 };
 	ofRectangle windowRectFS { 0, 0, 1920, 1080 };
 	void setFSTarget(ofWindowMode targetWindowMode);

libs/openFrameworks/types/ofRectangle.cpp

@@ -18,6 +18,11 @@ ofRectangle::ofRectangle(float px, float py, float w, float h) : x(position.x),
 	set(px,py,w,h);
 }
 
+//----------------------------------------------------------
+ofRectangle::ofRectangle(int px, int py, int w, int h) : x(position.x), y(position.y) {
+	set(px,py,w,h);
+}
+
 //----------------------------------------------------------
 ofRectangle::ofRectangle(const glm::vec3& p, float w, float h) : x(position.x), y(position.y) {
     set(p,w,h);

libs/openFrameworks/types/ofRectangle.h

@@ -105,6 +105,7 @@ class ofRectangle {
 	/// \param w The width of the rectangle.
 	/// \param h The height of the rectangle.
 	ofRectangle(float px, float py, float w, float h);
+	ofRectangle(int px, int py, int w, int h);
 
 	/// \brief Construct a rectangle from a point and dimensions.
 	///

libs/openFrameworks/utils/ofMatrixStack.cpp

@@ -142,8 +142,7 @@ glm::ivec2 ofMatrixStack::getRenderSurfaceSize() const {
 	if (currentRenderSurface) {
 		return currentRenderSurface->getSize();
 	} else if (currentWindow) {
-		// FIXME: FramebufferSize
-		return currentWindow->getWindowSize();
+		return currentWindow->getFramebufferSize();
 	} else {
 		return {};
 	}
@@ -204,12 +203,15 @@ ofRectangle ofMatrixStack::getNativeViewport() const{
 }
 
 ofRectangle ofMatrixStack::getFullSurfaceViewport() const{
+	cout << "ofMatrixStack::getFullSurfaceViewport()" << endl;
 	if(currentRenderSurface){
-		return ofRectangle(0,0,currentRenderSurface->getWidth(),currentRenderSurface->getHeight());
+		return { 0.0f, 0.0f, currentRenderSurface->getWidth(), currentRenderSurface->getHeight() };
 	}else if(currentWindow){
-		return ofRectangle(0,0,currentWindow->getWidth(),currentWindow->getHeight());
+		// FIXME: OWWW
+//		return { 0, 0, currentWindow->getWidth(), currentWindow->getHeight() };
+		return { 0, 0, currentWindow->getFramebufferSize().x, currentWindow->getFramebufferSize().y };
 	}else{
-		return ofRectangle();
+		return {};
 	}
 }