Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-08 09:24:18 +01:00
Code Issues Projects Releases Wiki Activity

use draw pipelines for selected objects

Browse source
This commit is contained in:
Val Erastov 2016-12-07 00:59:20 -08:00
parent 1939c7c988
commit af85e3e77b
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
web/app/sketcher/viewer2d.js
View file

@ -100,13 +100,16 @@ function Viewer(canvas, IO) {
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
this._activeLayer = null; this._activeLayer = null;
this.layers = []; this.layers = [];
this._serviceLayers = [];
this.dimLayer = new Layer("_dim", Styles.DIM); this.dimLayer = new Layer("_dim", Styles.DIM);
this.dimLayers = [this.dimLayer]; this.dimLayers = [this.dimLayer];
this.bus.defineObservable(this, 'dimScale', 1); this.bus.defineObservable(this, 'dimScale', 1);
this.bus.subscribe('dimScale', function(){ viewer.refresh(); }); this.bus.subscribe('dimScale', function(){ viewer.refresh(); });
this._workspace = [this.dimLayers, this.layers, this._serviceLayers]; this._workspace = [this.layers, this.dimLayers];
this.referencePoint = new ReferencePoint();
this._serviceWorkspace = [this._createServiceLayers()];
this.toolManager = new ToolManager(this, new PanTool(this)); this.toolManager = new ToolManager(this, new PanTool(this));
this.parametricManager = new ParametricManager(this); this.parametricManager = new ParametricManager(this);
@ -116,10 +119,6 @@ function Viewer(canvas, IO) {
this.selected = []; this.selected = [];
this.snapped = null; this.snapped = null;
this.referencePoint = new ReferencePoint();
this._setupServiceLayer();
this.historyManager = new HistoryManager(this); this.historyManager = new HistoryManager(this);
this.refresh(); this.refresh();
} }
@ -205,17 +204,13 @@ Viewer.prototype.search = function(x, y, buffer, deep, onlyPoints, filter) {
return pickResult; return pickResult;
}; };
Viewer.prototype._setupServiceLayer = function() { Viewer.prototype._createServiceLayers = function() {
let layer = new Layer("_selection", Styles.DEFAULT); let layer = new Layer("_service", Styles.SERVICE);
layer.objects = this.selected;
this._serviceLayers.push(layer);
layer = new Layer("_service", Styles.SERVICE);
// layer.objects.push(new CrossHair(0, 0, 20)); // layer.objects.push(new CrossHair(0, 0, 20));
layer.objects.push(new Point(0, 0, 2)); layer.objects.push(new Point(0, 0, 2));
layer.objects.push(this.referencePoint); layer.objects.push(this.referencePoint);
layer.objects.push(new BasisOrigin(null, this)); layer.objects.push(new BasisOrigin(null, this));
this._serviceLayers.push(layer); return [layer];
}; };
@ -241,8 +236,24 @@ Viewer.prototype.repaint = function() {
this.__prevStyle = null; this.__prevStyle = null;
for (let drawPredicate of Viewer.__DRAW_PIPELINE) { this.__drawWorkspace(ctx, this._workspace, Viewer.__SKETCH_DRAW_PIPELINE);
for (let layers of this._workspace) { this.__drawWorkspace(ctx, this._serviceWorkspace, Viewer.__SIMPLE_DRAW_PIPELINE);
};
Viewer.__SKETCH_DRAW_PIPELINE = [
(obj) => obj._class !== 'TCAD.TWO.EndPoint' && obj.marked === null,
(obj) => obj._class !== 'TCAD.TWO.EndPoint' && obj.marked !== null,
(obj) => obj._class === 'TCAD.TWO.EndPoint' && obj.marked === null,
(obj) => obj._class === 'TCAD.TWO.EndPoint' && obj.marked !== null
];
Viewer.__SIMPLE_DRAW_PIPELINE = [
(obj) => true
];
Viewer.prototype.__drawWorkspace = function(ctx, workspace, pipeline) {
for (let drawPredicate of pipeline) {
for (let layers of workspace) {
for (let layer of layers) { for (let layer of layers) {
for (let obj of layer.objects) { for (let obj of layer.objects) {
obj.accept((obj) => { obj.accept((obj) => {
@ -258,12 +269,6 @@ Viewer.prototype.repaint = function() {
} }
}; };
Viewer.__DRAW_PIPELINE = [
(obj) => obj._class !== 'TCAD.TWO.EndPoint',
(obj) => obj._class === 'TCAD.TWO.EndPoint' && obj.marked == null,
(obj) => obj._class === 'TCAD.TWO.EndPoint' && obj.marked != null
];
Viewer.prototype.__draw = function(ctx, layer, obj) { Viewer.prototype.__draw = function(ctx, layer, obj) {
let style = obj.style != null ? obj.style : layer.style; let style = obj.style != null ? obj.style : layer.style;
if (style !== this.__prevStyle) { if (style !== this.__prevStyle) {