branch: elpa/scad-mode
commit ad1254a3de39625e114c7f0a207b5adf813fc606
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Add scad-preview-view
See https://github.com/zk-phi/scad-preview/pull/8
---
README.org | 2 +-
ob-scad.el | 5 ++++-
scad-mode.el | 9 ++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/README.org b/README.org
index 0a65b8a6b9..a2d33e5bbe 100644
--- a/README.org
+++ b/README.org
@@ -15,7 +15,7 @@
- Syntax highlighting
- Basic completion function (press =M-TAB=)
-- Preview rendered model in separate window (press =C-c C-p=)
+- Preview rendered model in separate window (press =C-c C-c=)
- Open buffer in OpenSCAD (press =C-c C-o=)
- Export buffer with OpenSCAD (press =C-c C-e=)
diff --git a/ob-scad.el b/ob-scad.el
index f0f3f57c1e..1c4305e994 100644
--- a/ob-scad.el
+++ b/ob-scad.el
@@ -34,7 +34,8 @@
(defvar org-babel-header-args:scad
'((colorscheme . :any)
(imgsize . :any)
- (camera . :any))
+ (camera . :any)
+ (views . :any))
"Scad specific header args.")
(defun org-babel-execute:scad (body params)
@@ -51,6 +52,8 @@
"--viewall"
(format "--colorscheme=%s"
(alist-get :colorscheme params
scad-preview-colorscheme))
+ (format "--views=%s" (or (alist-get :views params)
+ (mapconcat #'identity
scad-preview-view ",")))
(when-let (camera (alist-get :camera params))
(format "--camera=%s" camera))
(when-let (imgsize (alist-get :imgsize params))
diff --git a/scad-mode.el b/scad-mode.el
index 7f1cf560a4..c581b3cb2c 100644
--- a/scad-mode.el
+++ b/scad-mode.el
@@ -128,10 +128,15 @@
"Colorscheme for rendering preview."
:type 'string)
+(defcustom scad-preview-view '("axes" "scales")
+ "List of views to be rendered.
+Options are axes, crosshairs, edges, scales, wireframe."
+ :type '(repeat string))
+
(defvar scad-mode-map
(let ((map (make-sparse-keymap)))
+ (define-key map "\C-c\C-c" #'scad-preview)
(define-key map "\C-c\C-o" #'scad-open)
- (define-key map "\C-c\C-p" #'scad-preview)
(define-key map "\C-c\C-e" #'scad-export)
(define-key map "\t" #'indent-for-tab-command)
(define-key map "\M-\t" #'completion-at-point)
@@ -349,6 +354,8 @@ Key bindings:
(format "--imgsize=%d,%d"
(car scad--preview-size)
(cdr scad--preview-size))
+ (format "--view=%s"
+ (mapconcat #'identity scad-preview-view
","))
(format "--camera=%s"
(mapconcat #'number-to-string
scad--preview-camera ","))
(format "--colorscheme=%s"
scad-preview-colorscheme)
