AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add beta warning, discord server link

Browse source
This commit is contained in:
Stewart Allen 2020-11-16 22:19:14 -05:00
commit 3c7fe43f24
5 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app.js
View file

@ -232,10 +232,10 @@ const script = {
"kiri",
"ext/three",
"license",
"ext/clip2",
// "ext/clip2",
"ext/tween",
"ext/fsave",
"ext/earcut",
// "ext/earcut",
"add/array",
"add/three",
"geo/base",
@ -248,7 +248,7 @@ const script = {
"geo/bounds",
"geo/polygon",
"geo/polygons",
"geo/gyroid",
// "geo/gyroid",
"moto/kv",
"moto/ajax",
"moto/ctrl",

2
notes.md
View file

@ -30,7 +30,6 @@
* `F` speculative background preview generation
* `F` control for size of purge block (with 0=disabled)
* `F` add separate fill speed control
* `F` show retract/engage in preview
* `F` manual support addition / control
* `F` polishing and other non-planar work
* `F` gradient infill https://www.youtube.com/watch?v=hq53gsYREHU&feature=emb_logo
@ -54,7 +53,6 @@
# CAM
* `B` contouring should extend beyond part boundaries by tool radius
* `B` outside cutting direction in roughing mode inverted
* `B` clear voids has double interior pass because wrong offset shadow used
* `B` fix contour up and over thru holes by adding (union) tabs to shadow

9
src/kiri/init.js
View file

@ -44,7 +44,8 @@
js2o = API.js2o,
o2js = API.o2js,
platform = API.platform,
selection = API.selection;
selection = API.selection,
beta = 2311;
let deviceLock = false,
selectedTool = null,
@ -2138,6 +2139,12 @@
$('app-info').innerText = KIRI.version;
// show topline separator when iframed
// try { if (WIN.self !== WIN.top) $('top-sep').style.display = 'flex' } catch (e) { }
// warn users they are running a beta release
if (beta && beta > 0 && SDB.kiri_beta != beta) {
API.show.alert("this is a beta / development release");
SDB.kiri_beta = beta;
}
}
// if a language needs to load, the script is injected and loaded

2
src/mode/cam/slice.js
View file

@ -188,7 +188,7 @@
const curr = indices[i];
const next = indices[i+1];
if (!flats.contains(curr) && flats.contains(next)) {
console.log('move',curr,'up toward',prev,'b/c next',next,'is flat');
// console.log('move',curr,'up toward',prev,'b/c next',next,'is flat');
indices[i] = next + ((prev - next) / 2);
}
}

19
web/kiri/lang/en-help.html
View file

@ -50,15 +50,15 @@
<b class="header">Quick Start Guide</b>
<div class="content">
<p>
<li>Use the <button><i class="fas fa-cogs"></i></button> Setup menu to select a <button><i class="fas fa-cube"></i></button> machine</li>
<li><button><i class="fas fa-plus"></i></button> Clone the machine if you want to customize it</li>
<li>Drag and drop an <a href="https://en.wikipedia.org/wiki/STL_(file_format)" target="_stl">STL file</a> onto the grid (turns green)</li>
<li>use the <button><i class="fas fa-cogs"></i></button> Setup menu to select a <button><i class="fas fa-cube"></i></button> machine</li>
<li><button><i class="fas fa-plus"></i></button> clone the machine if you want to customize it</li>
<li>drag and drop an <a href="https://en.wikipedia.org/wiki/STL_(file_format)" target="_stl">STL file</a> onto the grid (turns green)</li>
<li>or use <button><i class="fas fa-folder"></i></button> files <button><i class="fas fa-file-upload"></i></button> import from your computer</li>
<li>use the settings menus (right) to customize slicing parameters</li>
<li><button><i class="fas fa-bars"></i></button> slice objects to see the effect of the parameters</li>
<li><button><i class="fas fa-cubes"></i></button> preview calculates path data from slice objects</li>
<li><button><i class="fas fa-file-download"></i></button> export converts paths to files like GCode and SVG</li>
<li>Explore <button><i class="fas fa-cogs"></i></button> Setup <button><i class="fas fa-sliders-h"></i></button> preferences for app customization</li>
<li>explore <button><i class="fas fa-cogs"></i></button> setup <button><i class="fas fa-sliders-h"></i></button> preferences for app customization</li>
</p>
</div>
<div class="content">
@ -126,11 +126,12 @@
<div id="help-tab-support" class="help-tab f-col"><div class="content">
<b class="header">Resources</b>
<div class="content nounderline">
<a target="_fo" href="https://forum.grid.space"><i class="fab fa-discourse"></i> Grid.Space Discourse forums</a>
<a target="_tutor" href="https://www.youtube.com/playlist?list=PLRoVgyRoWZpumQIKWm7oldx3bjDivqP24"><i class="fab fa-youtube"></i> Youtube videos and tutorials</a>
<a target="_tw" href="https://twitter.com/grid_space_3d"><i class="fab fa-twitter"></i> Follow Grid.Space on Twitter</a>
<a target="_fb" href="https://facebook.com/groups/kirimoto"><i class="fab fa-facebook"></i> Kiri:Moto Users group on Facebook</a>
<a target="_help" href="https://wiki.grid.space/wiki/Kiri:Moto"><i class="fab fa-github"></i> Grid.Space Wiki</a>
<a target="_rsc" href="https://forum.grid.space"><i class="fab fa-discourse"></i> Grid.Space forums</a>
<a target="_rsc" href="https://discord.gg/suyCCgr"><i class="fab fa-discord"></i> Discord live chat server</a>
<a target="_rsc" href="https://www.youtube.com/playlist?list=PLRoVgyRoWZpumQIKWm7oldx3bjDivqP24"><i class="fab fa-youtube"></i> Youtube videos and tutorials</a>
<a target="_rsc" href="https://twitter.com/grid_space_3d"><i class="fab fa-twitter"></i> Follow Grid.Space on Twitter</a>
<a target="_rsc" href="https://facebook.com/groups/kirimoto"><i class="fab fa-facebook"></i> Kiri:Moto Users group on Facebook</a>
<a target="_rsc" href="https://wiki.grid.space/"><i class="fab fa-github"></i> Grid.Space Wiki</a>
</div>
<b class="header">In-App Options</b>
<p>