Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 09:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronizing batting viewport and svg dimensions

Browse Source 
Also switched to even more simple pattern to indicate insulation because of the vertex limit
This commit is contained in:
Andrej730
2023-03-02 15:50:13 +05:00
parent 588d6ccaaa
commit 4c58ca28e5
2 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/drawing/data.py
+6 -4
View File
@@ -135,7 +135,9 @@ class DecoratorData:
return result return result
element = tool.Ifc.get_entity(obj) element = tool.Ifc.get_entity(obj)
if element: if element:
result = ifcopenshell.util.element.get_pset(element, "BBIM_Batting", "Thickness") or 5.0 unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
cls.data[obj.name] = result thickness = ifcopenshell.util.element.get_pset(element, "BBIM_Batting", "Thickness")
return result thickness = thickness * unit_scale if thickness else 1.5
return 5.0 cls.data[obj.name] = thickness
return thickness
return 1.5
src/blenderbim/blenderbim/bim/module/drawing/decoration.py
+63 -29
View File
@@ -1355,8 +1355,6 @@ class BattingDecorator(BaseDecorator):
DEF_GLSL = ( DEF_GLSL = (
BaseDecorator.DEF_GLSL BaseDecorator.DEF_GLSL
+ """ + """
#define BREAK_LENGTH 32.0
#define BREAK_WIDTH 16.0
#define PATTERN_SEGMENT_LENGTH 2 #define PATTERN_SEGMENT_LENGTH 2
""" """
) )
@@ -1364,11 +1362,18 @@ class BattingDecorator(BaseDecorator):
GEOM_GLSL = """ GEOM_GLSL = """
uniform vec2 winsize; uniform vec2 winsize;
uniform float viewportDrawingScale; uniform float viewportDrawingScale;
uniform float batting_thickness; uniform float batting_thickness_winspace;
layout(lines) in; layout(lines) in;
layout(line_strip, max_vertices=256) out; layout(line_strip, max_vertices=256) out;
void place_vert(vec4 ref_point, vec2 win_space_vert) {
vec4 win2clip = matWIN2CLIP();
vec4 p = ref_point + vec4(win_space_vert, 0, 0);
gl_Position = WIN2CLIP(p);
EmitVertex();
}
void main() { void main() {
vec4 clip2win = matCLIP2WIN(); vec4 clip2win = matCLIP2WIN();
vec4 win2clip = matWIN2CLIP(); vec4 win2clip = matWIN2CLIP();
@@ -1380,13 +1385,33 @@ class BattingDecorator(BaseDecorator):
vec4 gap = dir * 16.0; // TODO: never used? vec4 gap = dir * 16.0; // TODO: never used?
float segment_width = batting_thickness / 2.5; float segment_width = batting_thickness_winspace / 2.5;
vec2 batting_dimensions = vec2(segment_width, batting_thickness); vec2 batting_dimensions = vec2(segment_width, batting_thickness_winspace);
// make sure to multiply by viewportDrawingScale // need to multiply by viewportDrawingScale
// so the drawing will stay consistent on zoom in / zoom out // so the drawing will stay consistent on zoom in / zoom out
mat2 m_edge_space = mat2( dir.xy, dir.yx*vec2(1,-1) ) * viewportDrawingScale; // but since we use winspace batting dimensions we skip it
mat2 m_edge_space = mat2( dir.xy, dir.yx*vec2(1,-1) );
vec2 pattern_segment_data[PATTERN_SEGMENT_LENGTH]; // simplied rectangle + cross version to indicate batting
place_vert(p0w, m_edge_space * ( vec2(0, 0.5) * batting_dimensions ) );
place_vert(p0w, m_edge_space * ( -vec2(0, 0.5) * batting_dimensions ) );
place_vert(p1w, m_edge_space * ( -vec2(0, 0.5) * batting_dimensions ) );
place_vert(p1w, m_edge_space * ( vec2(0, 0.5) * batting_dimensions ) );
place_vert(p0w, m_edge_space * ( vec2(0, 0.5) * batting_dimensions ) );
EndPrimitive();
place_vert(p0w, m_edge_space * ( -vec2(0, 0.5) * batting_dimensions ) );
place_vert(p1w, m_edge_space * ( vec2(0, 0.5) * batting_dimensions ) );
EndPrimitive();
place_vert(p0w, m_edge_space * ( vec2(0, 0.5) * batting_dimensions ) );
place_vert(p1w, m_edge_space * ( -vec2(0, 0.5) * batting_dimensions ) );
EndPrimitive();
// TODO: more fancy pattern? possibly use of frag shader?
// we're not using complicated patterns because of the
// hardware shader limit:
// Error: C6033: Hardware limitation reached, can only emit 256 vertices of this size
// vec2 pattern_segment_data[PATTERN_SEGMENT_LENGTH];
// simplified insulation pattern // simplified insulation pattern
// pattern_segment_data[0] = vec2(0, 1); // pattern_segment_data[0] = vec2(0, 1);
// pattern_segment_data[1] = vec2(0.5, 0.8); // pattern_segment_data[1] = vec2(0.5, 0.8);
@@ -1396,26 +1421,21 @@ class BattingDecorator(BaseDecorator):
// pattern_segment_data[5] = vec2(0.5, 0.8); // pattern_segment_data[5] = vec2(0.5, 0.8);
// pattern_segment_data[6] = vec2(1.0, 1.0); // pattern_segment_data[6] = vec2(1.0, 1.0);
// zigzag pattern // zigzag pattern
pattern_segment_data[0] = vec2(0, 1); // pattern_segment_data[0] = vec2(0, 1);
pattern_segment_data[1] = vec2(0, 0); // pattern_segment_data[1] = vec2(0, 0);
// int segs = int( ceil( length(edge) / (batting_dimensions.x * viewportDrawingScale) ) ); // amount of segments
int segs = int( ceil( length(edge) / (batting_dimensions.x * viewportDrawingScale) ) ); // amount of segments // vec4 p;
vec4 p; // vec2 p_base, p_cur_ver;
vec2 p_base, p_cur_ver; // for (int i = 0; i < segs; i++) {
// p_base = m_edge_space * (vec2(i, -0.5) * batting_dimensions);
for (int i = 0; i < segs; i++) { // for(int j=0; j<PATTERN_SEGMENT_LENGTH; j++) {
p_base = m_edge_space * (vec2(i, -0.5) * batting_dimensions); // p_cur_ver = p_base + m_edge_space * (pattern_segment_data[j] * batting_dimensions);
for(int j=0; j<PATTERN_SEGMENT_LENGTH; j++) { // place_vert(p0w, p_cur_ver);
p_cur_ver = p_base + m_edge_space * (pattern_segment_data[j] * batting_dimensions); // }
p = p0w + vec4(p_cur_ver, 0, 0); // }
gl_Position = WIN2CLIP(p); // gl_Position = p1;
EmitVertex(); // EmitVertex();
} // EndPrimitive();
}
gl_Position = p1;
EmitVertex();
EndPrimitive();
} }
""" """
@@ -1424,12 +1444,26 @@ class BattingDecorator(BaseDecorator):
verts, idxs = self.get_editmesh_geom(obj) verts, idxs = self.get_editmesh_geom(obj)
else: else:
verts, idxs = self.get_mesh_geom(obj) verts, idxs = self.get_mesh_geom(obj)
# TODO: find the less ugly way to figure thickness
thickness = DecoratorData.get_batting_thickness(obj)
region = context.region
region3d = context.region_data
original_edge_length = (verts[1]-verts[0]).length
clipspace_verts = [region3d.perspective_matrix @ v for v in verts[:2]]
winspace_verts = [v * Vector([region.width/2, region.height/2, 1]) for v in clipspace_verts]
win_space_edge_length = (winspace_verts[1]-winspace_verts[0]).xy.length
k = win_space_edge_length / original_edge_length
winspace_thickness = k * thickness
self.draw_lines( self.draw_lines(
context, context,
obj, obj,
verts[:2], verts[:2],
idxs, idxs,
extra_float_kwargs={"batting_thickness": DecoratorData.get_batting_thickness(obj)}, extra_float_kwargs={
"batting_thickness_winspace": winspace_thickness},
is_scale_dependant = False
) )