Ver código fonte

small fix. again. :eyes:

SakiKawasaki 4 anos atrás
pai
commit
a5a33e5f28

+ 4 - 3
src/nodesnim/nodescontrol/texture_rect.nim

@@ -75,7 +75,8 @@ method draw*(self: TextureRectPtr, w, h: GLfloat) =
     glBindTexture(GL_TEXTURE_2D, self.texture)
 
     glBegin(GL_QUADS)
-    if self.texture_mode == TEXTURE_FILL_XY:
+    case self.texture_mode
+    of TEXTURE_FILL_XY:
       glTexCoord2f(0, 0)
       glVertex2f(x, y)
       glTexCoord2f(0, 1)
@@ -84,7 +85,7 @@ method draw*(self: TextureRectPtr, w, h: GLfloat) =
       glVertex2f(x + self.rect_size.x, y - self.rect_size.y)
       glTexCoord2f(1, 0)
       glVertex2f(x + self.rect_size.x, y)
-    elif self.texture_mode == TEXTURE_KEEP_ASPECT_RATIO:
+    of TEXTURE_KEEP_ASPECT_RATIO:
       let
         w = self.rect_size.x / self.texture_size.x
         h = self.rect_size.y / self.texture_size.y
@@ -101,7 +102,7 @@ method draw*(self: TextureRectPtr, w, h: GLfloat) =
       glVertex2f(x2, y2)
       glTexCoord2f(1, 0)
       glVertex2f(x2, y1)
-    elif self.texture_mode == TEXTURE_CROP:
+    of TEXTURE_CROP:
       if self.texture_size.x < self.rect_size.x:
         let q = self.rect_size.x / self.texture_size.x
         self.texture_size.x *= q

+ 3 - 2
src/nodesnim/window.nim

@@ -282,9 +282,10 @@ proc windowLaunch* =
     info("launch window ...")
   glutDisplayFunc(display)
   glutIdleFunc(display)
-  glutReshapeFunc(reshape)
+  when not defined(android) and not defined(ios):
+    glutReshapeFunc(reshape)
+    glutMouseWheelFunc(wheel)
   glutMouseFunc(mouse)
-  glutMouseWheelFunc(wheel)
   glutKeyboardFunc(keyboardpress)
   glutKeyboardUpFunc(keyboardup)
   glutSpecialFunc(keyboardspecialpress)

+ 2 - 1
tests/test8.nim

@@ -18,7 +18,8 @@ texturerect.setTexture(texture)
 texturerect.resize(256, 256)
 texturerect.setBackgroundColor(Color(1, 0.6, 1, 0.6))
 texturerect.setTextureFilter(Color(1f, 1f, 1f))
-texturerect.texture_mode = TEXTURE_KEEP_ASPECT_RATIO  # Can be also TEXTURE_CROP or TEXTURE_FILL_XY
+# texture mode can be TEXTURE_CROP, TEXTURE_KEEP_ASPECT_RATIO or TEXTURE_FILL_XY
+texturerect.texture_mode = TEXTURE_CROP
 texturerect.texture_anchor = Anchor(0.5, 1, 0.5, 1)