small fixes

Author: jimy-byerley

madcad/primitives.py

@@ -40,6 +40,7 @@ def fit(self) -> err**2 as float:
 
 from math import sqrt
 from .mathutils import *
+from .mesh.container import typedlist_to_numpy
 from . import settings
 from . import mesh
 
@@ -408,7 +409,7 @@ def __repr__(self):
 
 	def display(self, scene):
 		from .rendering.d3.marker import SplineDisplay
-		return SplineDisplay(scene, typedlist_to_numpy(self.points), typedlist_to_numpy(self.mesh().points))
+		return SplineDisplay(scene, typedlist_to_numpy(self.points, np.float32), typedlist_to_numpy(self.mesh().points, np.float32))
 
 class Softened(object):
 	''' Interpolated curve tangent to each segment midpoint (3rd degree bezier curve)
@@ -458,5 +459,5 @@ def __repr__(self):
 
 	def display(self, scene):
 		from .rendering.d3.marker import SplineDisplay
-		return SplineDisplay(scene, typedlist_to_numpy(self.points), typedlist_to_numpy(self.mesh().points))
+		return SplineDisplay(scene, typedlist_to_numpy(self.points, np.float32), typedlist_to_numpy(self.mesh().points, np.float32))
 

madcad/rendering/base.py

@@ -105,9 +105,10 @@ def display(self, obj, former:Display=None) -> Display:
 			This is the actual function converting objects into displays.
 			You don't need to call this method if you just want to add an object to the scene, use add() instead
 		'''
+		# prevent reference-loop in groups (groups are taken from the execution env, so the user may not want to display it however we are trying to)
 		ido = id(obj)
-		assert ido not in self.memo, 'there should not be recursion loops in cascading displays'
-		self.memo.add(ido)
+		assert ido not in self._memo, 'there should not be recursion loops in cascading displays'
+		self._memo.add(ido)
 
 		try:
 			# no refresh if object has not changed
@@ -136,7 +137,7 @@ def display(self, obj, former:Display=None) -> Display:
 				raise TypeError('the display for {} is not a subclass of Display: {}'.format(type(obj).__name__, type(disp)))
 
 		finally:
-			self.memo.remove(ido)
+			self._memo.remove(ido)
 
 		# keeping a reference of the source object may increas the RAM used but avoid to refresh displays when updating the scene with the same constant value
 		if self.options['track_source']:
@@ -217,6 +218,8 @@ def render(self, view):
 
 	def selection_add(self, display:Display, sub:int=None):
 		''' select the given display '''
+		if not hasattr(display, 'selected'):
+			raise TypeError('{} is not selectable'.format(type(display).__name__))
 		if isinstance(display.selected, set):
 			display.selected.add(sub)
 			display.selected = display.selected
@@ -228,6 +231,8 @@ def selection_add(self, display:Display, sub:int=None):
 
 	def selection_remove(self, display:Display, sub:int=None):
 		''' deselect the given display '''
+		if not hasattr(display, 'selected'):
+			raise TypeError('{} is not selectable'.format(type(display).__name__))
 		if isinstance(display.selected, set):
 			if sub is None:
 				display.selected.clear()
@@ -242,6 +247,8 @@ def selection_remove(self, display:Display, sub:int=None):
 		self.touch()
 
 	def selection_toggle(self, display:Display, sub:int=None):
+		if not hasattr(display, 'selected'):
+			raise TypeError('{} is not selectable'.format(type(display).__name__))
 		if isinstance(display.selected, set):
 			selected = sub in display.selected
 		else:

madcad/rendering/d3/marker.py

@@ -239,10 +239,15 @@ class SplineDisplay(Display):
 	''' display for spline curve, with handles around'''
 	color: fvec4
 	box: Box
+	selected: bool
+	hovered: bool
 
 	def __init__(self, scene, handles, curve, color=None):
 		self.color = fvec3(color or settings.colors['line'])
+		self.color_handles = fvec3(settings.colors['annotation'])
 		self.box = npboundingbox(handles)
+		self.selected = False
+		self.hovered = False
 
 		ctx = scene.context
 		vb_handles = ctx.buffer(handles)
@@ -252,7 +257,7 @@ def __init__(self, scene, handles, curve, color=None):
 		self._va_handles = ctx.vertex_array(shader, [(vb_handles, '3f4', 'v_position')])
 		self._va_curve = ctx.vertex_array(shader, [(vb_curve, '3f4', 'v_position')], mode=mgl.LINE_STRIP)
 
-		shader = scene.share(shader_ident, shader_ident)
+		shader = scene.share(load_shader_ident, load_shader_ident)
 		self._va_ident = ctx.vertex_array(shader, [(vb_curve, '3f4', 'v_position')], mode=mgl.LINE_STRIP)
 
 	def stack(self, scene):
@@ -268,19 +273,19 @@ def _render(self, view):
 		view.scene.context.point_size = 4
 
 		self._va_handles.program['layer'] = -2e-6
-		self._va_handles.program['color'].write(self.color_handles if not self.selected else fvec4(settings.display['selection_color'],self.color_handles[3]))
+		self._va_handles.program['color'].write(fvec4(highlight_color(self, self.color_handles), 0.5))
 		self._va_handles.render(mgl.POINTS)
 		self._va_handles.render(mgl.LINE_STRIP)
 
 		self._va_curve.program['layer'] = -1e-6
-		self._va_curve.program['color'].write(self.color if not self.selected else fvec4(settings.display['selection_color'],self.color[3]))
+		self._va_curve.program['color'].write(fvec4(highlight_color(self, self.color), 1))
 		self._va_curve.render()
 
 	def _identify(self, view):
-		self.shader_ident['ident'] = view.identstep(1)
-		self.shader_ident['view'].write(view.uniforms['view'] * self.world)
-		self.shader_ident['proj'].write(view.uniforms['proj'])
-		self.va_ident.render()
+		self._va_ident.program['ident'] = view.identstep(1)
+		self._va_ident.program['view'].write(view.uniforms['view'] * self.world)
+		self._va_ident.program['proj'].write(view.uniforms['proj'])
+		self._va_ident.render()
 
 
 def digitfit(n):

madcad/settings.py

@@ -71,7 +71,6 @@
 	'display_groups': True,
 	'display_points': False,
 	'display_wire': False,
-	'display_grid': True,
 	'display_annotations': True,
 	'surface_shading': True,
 	'kinematic_manipulation': 'joint',

madcad/shaders/solid.frag

@@ -42,13 +42,18 @@ vec4 highlight(vec4 dst, vec4 src) {
 void main() {
 	vec3 nsight = normalize(sight);
 	vec3 nnormal = normalize(normal);
-	float diffuse = max(0, dot(nsight, nnormal));
+	float diffuse = dot(nsight, nnormal);
 	vec3 tosky = -reflect(nsight, nnormal);
 	vec3 refl = texture(reflectmap, skybox(tosky)).rgb;
 
 	// surface shading
 	color = vec4(refl * refl_color + mix(min_color, max_color, diffuse), 1);
 
+	if (diffuse < 0)  {
+		diffuse = 0.6;
+		color = vec4(min_color, 1);
+	}
+	
 	// highlighting
 	float margin = 0.1; // control how close to the horizon is the color saturation
 	float glow = min(margin*(1/max(0,(diffuse-margin)) -1), 1); // produce a glowy highlight