Commit f6876d40 authored by Guillaume Seguin's avatar Guillaume Seguin

Add mouse_to_plane util and use it to draw cursor indicator in stlplater

parent 140d9996
...@@ -19,6 +19,8 @@ from threading import Lock ...@@ -19,6 +19,8 @@ from threading import Lock
import logging import logging
import sys import sys
import traceback import traceback
import numpy
import numpy.linalg
import wx import wx
from wx import glcanvas from wx import glcanvas
...@@ -290,6 +292,22 @@ class wxGLPanel(wx.Panel): ...@@ -290,6 +292,22 @@ class wxGLPanel(wx.Panel):
ray_near = (px.value, py.value, pz.value) ray_near = (px.value, py.value, pz.value)
return ray_near, ray_far return ray_near, ray_far
def mouse_to_plane(self, x, y, plane_normal, plane_offset, local_transform = False):
# Ray/plane intersection
ray_near, ray_far = self.mouse_to_ray(x, y, local_transform)
ray_near = numpy.array(ray_near)
ray_far = numpy.array(ray_far)
ray_dir = ray_far - ray_near
ray_dir = ray_dir / numpy.linalg.norm(ray_dir)
plane_normal = numpy.array(plane_normal)
q = ray_dir.dot(plane_normal)
if q == 0:
return None
t = - (ray_near.dot(plane_normal) + plane_offset) / q
if t < 0:
return None
return ray_near + t * ray_dir
def zoom(self, factor, to = None): def zoom(self, factor, to = None):
glMatrixMode(GL_MODELVIEW) glMatrixMode(GL_MODELVIEW)
if to: if to:
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
import wx import wx
import time import time
import numpy
import pyglet import pyglet
pyglet.options['debug_gl'] = True pyglet.options['debug_gl'] = True
...@@ -28,7 +29,9 @@ from pyglet.gl import GL_AMBIENT_AND_DIFFUSE, glBegin, glClearColor, \ ...@@ -28,7 +29,9 @@ from pyglet.gl import GL_AMBIENT_AND_DIFFUSE, glBegin, glClearColor, \
glMultMatrixd, glNormal3f, glPolygonMode, glPopMatrix, GL_POSITION, \ glMultMatrixd, glNormal3f, glPolygonMode, glPopMatrix, GL_POSITION, \
glPushMatrix, glRotatef, glScalef, glShadeModel, GL_SHININESS, \ glPushMatrix, glRotatef, glScalef, glShadeModel, GL_SHININESS, \
GL_SMOOTH, GL_SPECULAR, glTranslatef, GL_TRIANGLES, glVertex3f, \ GL_SMOOTH, GL_SPECULAR, glTranslatef, GL_TRIANGLES, glVertex3f, \
glGetDoublev, GL_MODELVIEW_MATRIX, GLdouble glGetDoublev, GL_MODELVIEW_MATRIX, GLdouble, glClearDepth, glDepthFunc, \
GL_LEQUAL, GL_BLEND, glBlendFunc, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, \
GL_LINE_LOOP, glGetFloatv, GL_LINE_WIDTH, glLineWidth, glDisable, GL_LINE_SMOOTH
from pyglet import gl from pyglet import gl
from .gl.panel import wxGLPanel from .gl.panel import wxGLPanel
...@@ -110,7 +113,11 @@ class StlViewPanel(wxGLPanel): ...@@ -110,7 +113,11 @@ class StlViewPanel(wxGLPanel):
glClearColor(0, 0, 0, 1) glClearColor(0, 0, 0, 1)
glColor3f(1, 0, 0) glColor3f(1, 0, 0)
glEnable(GL_DEPTH_TEST) glEnable(GL_DEPTH_TEST)
glClearDepth(1.0)
glDepthFunc(GL_LEQUAL)
glEnable(GL_CULL_FACE) glEnable(GL_CULL_FACE)
glEnable(GL_BLEND)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
# Uncomment this line for a wireframe view # Uncomment this line for a wireframe view
# glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) # glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)
...@@ -278,11 +285,14 @@ class StlViewPanel(wxGLPanel): ...@@ -278,11 +285,14 @@ class StlViewPanel(wxGLPanel):
# Draw platform # Draw platform
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)
self.platform.draw() self.platform.draw()
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)
# Draw mouse # Draw mouse
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)
inter = self.mouse_to_plane(self.mousepos[0], self.mousepos[1],
plane_normal = (0, 0, 1), plane_offset = 0,
local_transform = False)
if inter is not None:
glPushMatrix() glPushMatrix()
x, y, z = self.mouse_to_3d(self.mousepos[0], self.mousepos[1], 0.9) glTranslatef(inter[0], inter[1], inter[2])
glTranslatef(x, y, z)
glBegin(GL_TRIANGLES) glBegin(GL_TRIANGLES)
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(1, 0, 0, 1)) glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(1, 0, 0, 1))
glNormal3f(0, 0, 1) glNormal3f(0, 0, 1)
...@@ -293,11 +303,11 @@ class StlViewPanel(wxGLPanel): ...@@ -293,11 +303,11 @@ class StlViewPanel(wxGLPanel):
glVertex3f(2, 2, 0) glVertex3f(2, 2, 0)
glVertex3f(-2, -2, 0) glVertex3f(-2, -2, 0)
glEnd() glEnd()
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(0.3, 0.7, 0.5, 1))
glPopMatrix() glPopMatrix()
glPushMatrix()
# Draw objects # Draw objects
glPushMatrix()
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, vec(0.3, 0.7, 0.5, 1))
for i in self.parent.models: for i in self.parent.models:
model = self.parent.models[i] model = self.parent.models[i]
glPushMatrix() glPushMatrix()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment