GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-26 10:14:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2017-06-19 11:34:06 +02:00
commit 015c253252
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/LayerDataBuilder.py
View File

@ -69,7 +69,7 @@ class LayerDataBuilder(MeshBuilder):
vertex_offset = 0 vertex_offset = 0
index_offset = 0 index_offset = 0
for layer, data in self._layers.items(): for layer, data in sorted(self._layers.items()):
( vertex_offset, index_offset ) = data.build( vertex_offset, index_offset, vertices, colors, line_dimensions, extruders, line_types, indices) ( vertex_offset, index_offset ) = data.build( vertex_offset, index_offset, vertices, colors, line_dimensions, extruders, line_types, indices)
self._element_counts[layer] = data.elementCount self._element_counts[layer] = data.elementCount

6
plugins/LayerView/LayerPass.py
View File

@ -82,12 +82,12 @@ class LayerPass(RenderPass):
start = 0 start = 0
end = 0 end = 0
element_counts = layer_data.getElementCounts() element_counts = layer_data.getElementCounts()
for layer, counts in element_counts.items(): for layer in sorted(element_counts.keys()):
if layer > self._layer_view._current_layer_num: if layer > self._layer_view._current_layer_num:
break break
if self._layer_view._minimum_layer_num > layer: if self._layer_view._minimum_layer_num > layer:
start += counts start += element_counts[layer]
end += counts end += element_counts[layer]
# This uses glDrawRangeElements internally to only draw a certain range of lines. # This uses glDrawRangeElements internally to only draw a certain range of lines.
batch = RenderBatch(self._layer_shader, type = RenderBatch.RenderType.Solid, mode = RenderBatch.RenderMode.Lines, range = (start, end)) batch = RenderBatch(self._layer_shader, type = RenderBatch.RenderType.Solid, mode = RenderBatch.RenderMode.Lines, range = (start, end))

6
resources/definitions/peopoly_moai.def.json
View File

@ -114,6 +114,12 @@
"speed_slowdown_layers": { "speed_slowdown_layers": {
"value": "2" "value": "2"
}, },
"infill_overlap": {
"value": "15"
},
"adhesion_type": {
"value": "\"none\""
},
"acceleration_enabled": { "acceleration_enabled": {
"value": "False" "value": "False"