Skip to content

Commit 5ace774

Browse files
committed
Updated theme colours for grid markers
1 parent dc4f471 commit 5ace774

9 files changed

Lines changed: 23 additions & 23 deletions

File tree

dist/GCodeSVGRenderer-CUIpGM_S.cjs

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/GCodeSVGRenderer-mg1clEmp.cjs

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/react.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("react"),V=require("./GCodeSVGRenderer-mg1clEmp.cjs");function F(l){const u=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const s in l)if(s!=="default"){const i=Object.getOwnPropertyDescriptor(l,s);Object.defineProperty(u,s,i.get?i:{enumerable:!0,get:()=>l[s]})}}return u.default=l,Object.freeze(u)}const o=F(w),C=o.forwardRef(function(u,s){const{id:i,options:a,callbacks:d,className:m,style:f}=u,c=o.useRef(null),t=o.useRef(null);return o.useEffect(()=>{const e=c.current;if(!e)return;const p=new V.GCodeViewer({id:i,container:e,options:a,callbacks:d});return t.current=p,()=>{t.current=null,p.dispose()}},[i]),o.useEffect(()=>{var e;(e=t.current)==null||e.setOptions(a??{})},[a]),o.useEffect(()=>{var e;(e=t.current)==null||e.setCallbacks(d??{})},[d]),o.useImperativeHandle(s,()=>{const e=()=>{const r=t.current;if(!r)throw new Error("GCodeViewer is not ready.");return r};return{get id(){return i},setCallbacks(r){e().setCallbacks(r)},snapCameraToView(r,n){e().snapCameraToView(r,n)},setBitPosition(r,n){e().setBitPosition(r,n)},setBitVisible(r){e().setBitVisible(r)},setToolpathRotationA(r){e().setToolpathRotationA(r)},hideUntilLine(r,n){e().hideUntilLine(r,n)},seekToLine(r,n){e().seekToLine(r,n)},showAll(){e().showAll()},resetColors(){e().resetColors()},loadFromUrl(r,n){return e().loadFromUrl(r,n)},loadFromFile(r){return e().loadFromFile(r)},loadFromText(r){return e().loadFromText(r)},loadFromLines(r){return e().loadFromLines(r)},loadFromWorkerData(r){return e().loadFromWorkerData(r)},unload(){e().unload()},setOptions(r){e().setOptions(r)},getOptions(){return e().getOptions()},resize(){e().resize()},focusToModel(){e().focusToModel()},resetCamera(){e().resetCamera()},getBounds(){return e().getBounds()},dispose(){e().dispose()}}},[i]),o.createElement("div",{ref:c,className:m,style:f})}),G=o.forwardRef(function(u,s){const{id:i,options:a,className:d,style:m}=u,f=o.useRef(null),c=o.useRef(null);return o.useEffect(()=>{const t=f.current;if(!t)return;const e=new V.GCodeSVGRenderer(t,a);return c.current=e,()=>{c.current=null,e.dispose()}},[]),o.useEffect(()=>{var t;a&&((t=c.current)==null||t.setOptions(a))},[a]),o.useImperativeHandle(s,()=>{const t=()=>{const e=c.current;if(!e)throw new Error("GCodeSVGRenderer is not ready.");return e};return{loadFromLines:e=>t().loadFromLines(e),loadFromFile:e=>t().loadFromFile(e),loadFromText:e=>t().loadFromText(e),loadFromWorkerData:e=>t().loadFromWorkerData(e),clear:()=>t().clear(),resetView:()=>t().resetView(),setOptions:e=>t().setOptions(e),setProjectionMode:e=>t().setProjectionMode(e),getSVGElement:()=>t().getSVGElement(),dispose:()=>t().dispose()}},[]),o.createElement("div",{ref:f,className:d,style:{width:"100%",height:"100%",...m}})});exports.GCodeSVGVisualizer=G;exports.GCodeVisualizer=C;
1+
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("react"),V=require("./GCodeSVGRenderer-CUIpGM_S.cjs");function F(l){const u=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(l){for(const s in l)if(s!=="default"){const i=Object.getOwnPropertyDescriptor(l,s);Object.defineProperty(u,s,i.get?i:{enumerable:!0,get:()=>l[s]})}}return u.default=l,Object.freeze(u)}const o=F(w),C=o.forwardRef(function(u,s){const{id:i,options:a,callbacks:d,className:m,style:f}=u,c=o.useRef(null),t=o.useRef(null);return o.useEffect(()=>{const e=c.current;if(!e)return;const p=new V.GCodeViewer({id:i,container:e,options:a,callbacks:d});return t.current=p,()=>{t.current=null,p.dispose()}},[i]),o.useEffect(()=>{var e;(e=t.current)==null||e.setOptions(a??{})},[a]),o.useEffect(()=>{var e;(e=t.current)==null||e.setCallbacks(d??{})},[d]),o.useImperativeHandle(s,()=>{const e=()=>{const r=t.current;if(!r)throw new Error("GCodeViewer is not ready.");return r};return{get id(){return i},setCallbacks(r){e().setCallbacks(r)},snapCameraToView(r,n){e().snapCameraToView(r,n)},setBitPosition(r,n){e().setBitPosition(r,n)},setBitVisible(r){e().setBitVisible(r)},setToolpathRotationA(r){e().setToolpathRotationA(r)},hideUntilLine(r,n){e().hideUntilLine(r,n)},seekToLine(r,n){e().seekToLine(r,n)},showAll(){e().showAll()},resetColors(){e().resetColors()},loadFromUrl(r,n){return e().loadFromUrl(r,n)},loadFromFile(r){return e().loadFromFile(r)},loadFromText(r){return e().loadFromText(r)},loadFromLines(r){return e().loadFromLines(r)},loadFromWorkerData(r){return e().loadFromWorkerData(r)},unload(){e().unload()},setOptions(r){e().setOptions(r)},getOptions(){return e().getOptions()},resize(){e().resize()},focusToModel(){e().focusToModel()},resetCamera(){e().resetCamera()},getBounds(){return e().getBounds()},dispose(){e().dispose()}}},[i]),o.createElement("div",{ref:c,className:m,style:f})}),G=o.forwardRef(function(u,s){const{id:i,options:a,className:d,style:m}=u,f=o.useRef(null),c=o.useRef(null);return o.useEffect(()=>{const t=f.current;if(!t)return;const e=new V.GCodeSVGRenderer(t,a);return c.current=e,()=>{c.current=null,e.dispose()}},[]),o.useEffect(()=>{var t;a&&((t=c.current)==null||t.setOptions(a))},[a]),o.useImperativeHandle(s,()=>{const t=()=>{const e=c.current;if(!e)throw new Error("GCodeSVGRenderer is not ready.");return e};return{loadFromLines:e=>t().loadFromLines(e),loadFromFile:e=>t().loadFromFile(e),loadFromText:e=>t().loadFromText(e),loadFromWorkerData:e=>t().loadFromWorkerData(e),clear:()=>t().clear(),resetView:()=>t().resetView(),setOptions:e=>t().setOptions(e),setProjectionMode:e=>t().setProjectionMode(e),getSVGElement:()=>t().getSVGElement(),dispose:()=>t().dispose()}},[]),o.createElement("div",{ref:f,className:d,style:{width:"100%",height:"100%",...m}})});exports.GCodeSVGVisualizer=G;exports.GCodeVisualizer=C;

dist/react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as o from "react";
2-
import { a as F, G as w } from "./GCodeSVGRenderer-CfCN3kNu.js";
2+
import { a as F, G as w } from "./GCodeSVGRenderer-DBuIVjIT.js";
33
const C = o.forwardRef(
44
function(u, c) {
55
const { id: a, options: n, callbacks: l, className: f, style: d } = u, i = o.useRef(null), t = o.useRef(null);

dist/viewer.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./GCodeSVGRenderer-mg1clEmp.cjs"),a={dark:{background:"#111827",opacity:.9,rapidOpacity:.3,colors:{rapid:"#0ef6ae",cutting:"#3e85c7",laser:"#a855f7",processed:"#6b7280",boundingBox:"#77a9d7",grid:{major:"#2f3840",minor:"#1f252b"},axes:{x:"#df3b3b",y:"#06b881",z:"#295d8d"}}},light:{background:"#e5e7eb",opacity:.9,rapidOpacity:.3,colors:{rapid:"#295d8d",cutting:"#111827",laser:"#FF0000",processed:"#9ca3af",boundingBox:"#5191cc",grid:{major:"#77a9d7",minor:"#a8c6e4"},axes:{x:"#df3b3b",y:"#06b881",z:"#295d8d"}}},"flexoki-dark":{background:"#100f0f",opacity:.9,rapidOpacity:.3,colors:{rapid:"#DA702C",cutting:"#3AA99F",laser:"#8B7EC8",processed:"#6f6e69",boundingBox:"#da702c",grid:{major:"#403e3c",minor:"#282726"},axes:{x:"#d14d41",y:"#879a39",z:"#4385be"}}},"tokyo-night":{background:"#1a1b26",opacity:.9,rapidOpacity:.3,colors:{rapid:"#ff9e64",cutting:"#7dcfff",laser:"#bb9af7",processed:"#565f89",boundingBox:"#73daca",grid:{major:"#414868",minor:"#24283b"},axes:{x:"#f7768e",y:"#9ece6a",z:"#7aa2f7"}}},"gruvbox-light":{background:"#fbf1c7",opacity:.9,rapidOpacity:.3,colors:{rapid:"#d65d0e",cutting:"#3c3836",laser:"#b16286",processed:"#928374",boundingBox:"#076678",grid:{major:"#d5c4a1",minor:"#ebdbb2"},axes:{x:"#cc241d",y:"#98971a",z:"#458588"}}},"ayu-dark":{background:"#0b0e14",opacity:.9,rapidOpacity:.3,colors:{rapid:"#FFA659",cutting:"#73D0FF",laser:"#DFBFFF",processed:"#6E7C8F",boundingBox:"#95E6CB",grid:{major:"#242b38",minor:"#1a1f2b"},axes:{x:"#F28779",y:"#D5FF80",z:"#5CCFE6"}}},"ayu-light":{background:"#fafafa",opacity:.9,rapidOpacity:.3,colors:{rapid:"#FA8D3E",cutting:"#22A4E6",laser:"#A37ACC",processed:"#ADAEB1",boundingBox:"#5C6773",grid:{major:"#c9cacc",minor:"#e5e7ea"},axes:{x:"#F07171",y:"#86B300",z:"#55B4D4"}}}};exports.GCodeSVGRenderer=e.GCodeSVGRenderer;exports.GCodeViewer=e.GCodeViewer;exports.ViewCube=e.ViewCube;exports.defaultGCodeViewerOptions=e.defaultGCodeViewerOptions;exports.defaultGCodeViewerTheme=e.defaultGCodeViewerTheme;exports.gCodeViewerThemePresets=a;
1+
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./GCodeSVGRenderer-CUIpGM_S.cjs"),a={dark:{background:"#111827",opacity:.9,rapidOpacity:.3,colors:{rapid:"#0ef6ae",cutting:"#3e85c7",laser:"#a855f7",processed:"#6b7280",boundingBox:"#77a9d7",grid:{major:"#77a9d7",minor:"#3e6e9e"},axes:{x:"#df3b3b",y:"#06b881",z:"#295d8d"}}},light:{background:"#e5e7eb",opacity:.9,rapidOpacity:.3,colors:{rapid:"#295d8d",cutting:"#111827",laser:"#FF0000",processed:"#9ca3af",boundingBox:"#5191cc",grid:{major:"#295d8d",minor:"#5191cc"},axes:{x:"#df3b3b",y:"#06b881",z:"#295d8d"}}},"flexoki-dark":{background:"#100f0f",opacity:.9,rapidOpacity:.3,colors:{rapid:"#DA702C",cutting:"#3AA99F",laser:"#8B7EC8",processed:"#6f6e69",boundingBox:"#da702c",grid:{major:"#a89984",minor:"#6f6e69"},axes:{x:"#d14d41",y:"#879a39",z:"#4385be"}}},"tokyo-night":{background:"#1a1b26",opacity:.9,rapidOpacity:.3,colors:{rapid:"#ff9e64",cutting:"#7dcfff",laser:"#bb9af7",processed:"#565f89",boundingBox:"#73daca",grid:{major:"#7aa2f7",minor:"#414868"},axes:{x:"#f7768e",y:"#9ece6a",z:"#7aa2f7"}}},"gruvbox-light":{background:"#fbf1c7",opacity:.9,rapidOpacity:.3,colors:{rapid:"#d65d0e",cutting:"#3c3836",laser:"#b16286",processed:"#928374",boundingBox:"#076678",grid:{major:"#7c6f64",minor:"#a89984"},axes:{x:"#cc241d",y:"#98971a",z:"#458588"}}},"ayu-dark":{background:"#0b0e14",opacity:.9,rapidOpacity:.3,colors:{rapid:"#FFA659",cutting:"#73D0FF",laser:"#DFBFFF",processed:"#6E7C8F",boundingBox:"#95E6CB",grid:{major:"#77a9d7",minor:"#3e6590"},axes:{x:"#F28779",y:"#D5FF80",z:"#5CCFE6"}}},"ayu-light":{background:"#fafafa",opacity:.9,rapidOpacity:.3,colors:{rapid:"#FA8D3E",cutting:"#22A4E6",laser:"#A37ACC",processed:"#ADAEB1",boundingBox:"#5C6773",grid:{major:"#5c6773",minor:"#9aacba"},axes:{x:"#F07171",y:"#86B300",z:"#55B4D4"}}}};exports.GCodeSVGRenderer=e.GCodeSVGRenderer;exports.GCodeViewer=e.GCodeViewer;exports.ViewCube=e.ViewCube;exports.defaultGCodeViewerOptions=e.defaultGCodeViewerOptions;exports.defaultGCodeViewerTheme=e.defaultGCodeViewerTheme;exports.gCodeViewerThemePresets=a;

dist/viewer.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { G as r, a as d, V as i, d as c, b as s } from "./GCodeSVGRenderer-CfCN3kNu.js";
1+
import { G as e, a as d, V as i, d as c, b as s } from "./GCodeSVGRenderer-DBuIVjIT.js";
22
const a = {
33
dark: {
44
background: "#111827",
@@ -10,7 +10,7 @@ const a = {
1010
laser: "#a855f7",
1111
processed: "#6b7280",
1212
boundingBox: "#77a9d7",
13-
grid: { major: "#2f3840", minor: "#1f252b" },
13+
grid: { major: "#77a9d7", minor: "#3e6e9e" },
1414
axes: { x: "#df3b3b", y: "#06b881", z: "#295d8d" }
1515
}
1616
},
@@ -24,7 +24,7 @@ const a = {
2424
laser: "#FF0000",
2525
processed: "#9ca3af",
2626
boundingBox: "#5191cc",
27-
grid: { major: "#77a9d7", minor: "#a8c6e4" },
27+
grid: { major: "#295d8d", minor: "#5191cc" },
2828
axes: { x: "#df3b3b", y: "#06b881", z: "#295d8d" }
2929
}
3030
},
@@ -38,7 +38,7 @@ const a = {
3838
laser: "#8B7EC8",
3939
processed: "#6f6e69",
4040
boundingBox: "#da702c",
41-
grid: { major: "#403e3c", minor: "#282726" },
41+
grid: { major: "#a89984", minor: "#6f6e69" },
4242
axes: { x: "#d14d41", y: "#879a39", z: "#4385be" }
4343
}
4444
},
@@ -52,7 +52,7 @@ const a = {
5252
laser: "#bb9af7",
5353
processed: "#565f89",
5454
boundingBox: "#73daca",
55-
grid: { major: "#414868", minor: "#24283b" },
55+
grid: { major: "#7aa2f7", minor: "#414868" },
5656
axes: { x: "#f7768e", y: "#9ece6a", z: "#7aa2f7" }
5757
}
5858
},
@@ -66,7 +66,7 @@ const a = {
6666
laser: "#b16286",
6767
processed: "#928374",
6868
boundingBox: "#076678",
69-
grid: { major: "#d5c4a1", minor: "#ebdbb2" },
69+
grid: { major: "#7c6f64", minor: "#a89984" },
7070
axes: { x: "#cc241d", y: "#98971a", z: "#458588" }
7171
}
7272
},
@@ -80,7 +80,7 @@ const a = {
8080
laser: "#DFBFFF",
8181
processed: "#6E7C8F",
8282
boundingBox: "#95E6CB",
83-
grid: { major: "#242b38", minor: "#1a1f2b" },
83+
grid: { major: "#77a9d7", minor: "#3e6590" },
8484
axes: { x: "#F28779", y: "#D5FF80", z: "#5CCFE6" }
8585
}
8686
},
@@ -94,13 +94,13 @@ const a = {
9494
laser: "#A37ACC",
9595
processed: "#ADAEB1",
9696
boundingBox: "#5C6773",
97-
grid: { major: "#c9cacc", minor: "#e5e7ea" },
97+
grid: { major: "#5c6773", minor: "#9aacba" },
9898
axes: { x: "#F07171", y: "#86B300", z: "#55B4D4" }
9999
}
100100
}
101101
};
102102
export {
103-
r as GCodeSVGRenderer,
103+
e as GCodeSVGRenderer,
104104
d as GCodeViewer,
105105
i as ViewCube,
106106
c as defaultGCodeViewerOptions,

src/viewer/grid/grid.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ export function createUnitGrid(args: {
3333

3434
const group = new THREE.Group();
3535
if (gridVertices.length > 0) {
36-
group.add(createLineSegments(gridVertices, args.theme.colors.grid.minor, 0.5));
36+
group.add(createLineSegments(gridVertices, args.theme.colors.grid.minor, 0.25));
3737
}
3838
if (centerVertices.length > 0) {
39-
group.add(createLineSegments(centerVertices, args.theme.colors.grid.major, 0.6));
39+
group.add(createLineSegments(centerVertices, args.theme.colors.grid.major, 0.4));
4040
}
4141
return group;
4242
}

src/viewer/themes.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
2020
laser: "#a855f7",
2121
processed: "#6b7280",
2222
boundingBox: "#77a9d7",
23-
grid: { major: "#2f3840", minor: "#1f252b" },
23+
grid: { major: "#77a9d7", minor: "#3e6e9e" },
2424
axes: { x: "#df3b3b", y: "#06b881", z: "#295d8d" },
2525
},
2626
},
@@ -34,7 +34,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
3434
laser: "#FF0000",
3535
processed: "#9ca3af",
3636
boundingBox: "#5191cc",
37-
grid: { major: "#77a9d7", minor: "#a8c6e4" },
37+
grid: { major: "#295d8d", minor: "#5191cc" },
3838
axes: { x: "#df3b3b", y: "#06b881", z: "#295d8d" },
3939
},
4040
},
@@ -48,7 +48,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
4848
laser: "#8B7EC8",
4949
processed: "#6f6e69",
5050
boundingBox: "#da702c",
51-
grid: { major: "#403e3c", minor: "#282726" },
51+
grid: { major: "#a89984", minor: "#6f6e69" },
5252
axes: { x: "#d14d41", y: "#879a39", z: "#4385be" },
5353
},
5454
},
@@ -62,7 +62,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
6262
laser: "#bb9af7",
6363
processed: "#565f89",
6464
boundingBox: "#73daca",
65-
grid: { major: "#414868", minor: "#24283b" },
65+
grid: { major: "#7aa2f7", minor: "#414868" },
6666
axes: { x: "#f7768e", y: "#9ece6a", z: "#7aa2f7" },
6767
},
6868
},
@@ -76,7 +76,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
7676
laser: "#b16286",
7777
processed: "#928374",
7878
boundingBox: "#076678",
79-
grid: { major: "#d5c4a1", minor: "#ebdbb2" },
79+
grid: { major: "#7c6f64", minor: "#a89984" },
8080
axes: { x: "#cc241d", y: "#98971a", z: "#458588" },
8181
},
8282
},
@@ -90,7 +90,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
9090
laser: "#DFBFFF",
9191
processed: "#6E7C8F",
9292
boundingBox: "#95E6CB",
93-
grid: { major: "#242b38", minor: "#1a1f2b" },
93+
grid: { major: "#77a9d7", minor: "#3e6590" },
9494
axes: { x: "#F28779", y: "#D5FF80", z: "#5CCFE6" },
9595
},
9696
},
@@ -104,7 +104,7 @@ export const gCodeViewerThemePresets: Record<GCodeViewerThemePresetName, GCodeVi
104104
laser: "#A37ACC",
105105
processed: "#ADAEB1",
106106
boundingBox: "#5C6773",
107-
grid: { major: "#c9cacc", minor: "#e5e7ea" },
107+
grid: { major: "#5c6773", minor: "#9aacba" },
108108
axes: { x: "#F07171", y: "#86B300", z: "#55B4D4" },
109109
},
110110
},

0 commit comments

Comments
 (0)