Skip to content

Editor/fix load size #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 21, 2017
Merged

Editor/fix load size #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4710754
call sizeSet at load
arukuka Nov 21, 2017
65a748d
set default think time for 20 sec.
arukuka Nov 21, 2017
b39e085
change sample-course.json to set default think time for 20 sec.
arukuka Nov 21, 2017
482c1e0
Revert "call sizeSet at load"
arukuka Nov 21, 2017
7bafd3a
renew ylimit insted of calling sizeSet
arukuka Nov 21, 2017
272d09f
0 padding sample course .smrjky
arukuka Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
Length: <input id="courseLength" type="number" min="10" max="1000" value="30">
Vision: <input id="vision" type="number" min="5" max="1000" value="10">
Time Limit: <input id="thinkTime" type="number" min="100"
max="100000" value="2000">
max="100000" value="20000">
Step Limit: <input id="stepLimit" type="number" min="10"
max="1000" value="50">
<button onclick="sizeSet(event)">Set Size</button>
Expand Down
3 changes: 2 additions & 1 deletion editor/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var startAnew;
var course = {
filetype: editingCourseFileType,
width: 15, length: 30, vision: 10,
thinkTime: 2000, stepLimit: 50,
thinkTime: 20000, stepLimit: 50,
x0: 6, x1: 8,
obstacles: []
};
Expand Down Expand Up @@ -128,6 +128,7 @@ function loadFile(evt) {
document.getElementById("vision").value = course.vision;
document.getElementById("thinkTime").value = course.thinkTime;
document.getElementById("stepLimit").value = course.stepLimit;
ylimit = course.length+course.vision-1;
buildCourse();
}
};
Expand Down
2 changes: 1 addition & 1 deletion samples/sample-course.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"filetype":"race course for editing","width":15,"length":100,"vision":8,"thinkTime":2000,"stepLimit":100,"x0":5,"x1":9,"obstacles":[[{"x":7,"y":2},{"x":11,"y":13},{"x":3,"y":9}],[{"x":7,"y":18},{"x":0,"y":23},{"x":0,"y":11}],[{"x":14,"y":16},{"x":6,"y":26},{"x":14,"y":28}],[{"x":0,"y":30},{"x":5,"y":36},{"x":3,"y":40},{"x":11,"y":44},{"x":0,"y":46}],[{"x":7,"y":47},{"x":14,"y":55},{"x":14,"y":46}],[{"x":5,"y":57},{"x":5,"y":50},{"x":9,"y":54}],[{"x":0,"y":60},{"x":10,"y":63},{"x":0,"y":68}],[{"x":9,"y":74},{"x":8,"y":77},{"x":14,"y":78},{"x":14,"y":66}],[{"x":0,"y":92},{"x":6,"y":91},{"x":11,"y":87},{"x":4,"y":86},{"x":0,"y":81}],[{"x":14,"y":98},{"x":10,"y":95},{"x":14,"y":91}]]}
{"filetype":"race course for editing","width":15,"length":100,"vision":8,"thinkTime":20000,"stepLimit":100,"x0":5,"x1":9,"obstacles":[[{"x":7,"y":2},{"x":11,"y":13},{"x":3,"y":9}],[{"x":7,"y":18},{"x":0,"y":23},{"x":0,"y":11}],[{"x":14,"y":16},{"x":6,"y":26},{"x":14,"y":28}],[{"x":0,"y":30},{"x":5,"y":36},{"x":3,"y":40},{"x":11,"y":44},{"x":0,"y":46}],[{"x":7,"y":47},{"x":14,"y":55},{"x":14,"y":46}],[{"x":5,"y":57},{"x":5,"y":50},{"x":9,"y":54}],[{"x":0,"y":60},{"x":10,"y":63},{"x":0,"y":68}],[{"x":9,"y":74},{"x":8,"y":77},{"x":14,"y":78},{"x":14,"y":66}],[{"x":0,"y":92},{"x":6,"y":91},{"x":11,"y":87},{"x":4,"y":86},{"x":0,"y":81}],[{"x":14,"y":98},{"x":10,"y":95},{"x":14,"y":91}]]}
2 changes: 1 addition & 1 deletion samples/sample-course.smrjky
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"filetype":"race course","width":15,"length":100,"vision":8,"thinkTime":20000,"stepLimit":100,"x0":5,"x1":9,"obstacles":[[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,1,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,1,1,1,0,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,0,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,0,0,0,0,0,0],[0,0,0,0,1,1,1,1,1,1,0,0,0,0,0],[0,0,0,1,1,1,1,1,1,1,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,1,0,0,0,0,0],[1,0,0,0,0,0,0,1,1,1,1,0,0,0,0],[1,1,0,0,0,0,0,0,0,1,1,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,1,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,1],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,1],[1,1,1,1,1,1,1,1,0,0,0,0,0,1,1],[1,1,1,1,1,1,0,0,0,0,0,0,1,1,1],[1,1,1,1,1,0,0,0,0,0,0,1,1,1,1],[1,1,1,0,0,0,0,0,0,0,1,1,1,1,1],[1,1,0,0,0,0,0,0,0,0,1,1,1,1,1],[1,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,1,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,1,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,1,1,0,0,0,0,1,1,1,1],[0,0,0,0,0,1,1,1,0,0,0,0,1,1,1],[0,0,0,0,0,1,1,1,1,0,0,0,0,1,1],[0,0,0,0,0,1,1,1,1,1,0,0,0,0,1],[0,0,0,0,0,1,1,1,0,0,0,0,0,0,1],[0,0,0,0,0,1,1,0,0,0,0,0,0,0,0],[0,0,0,0,0,1,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,0,0,0,0],[1,1,1,1,1,1,1,1,1,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,1],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,1],[1,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,0,0,0],[1,1,1,1,1,1,1,1,1,1,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,1],[1,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}
{"filetype":"race course","width":15,"length":100,"vision":8,"thinkTime":20000,"stepLimit":100,"x0":5,"x1":9,"obstacles":[[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,1,1,0,0,0,0,0,0,0],[0,0,0,0,0,0,1,1,1,0,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,0,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,0,0,0,0,0,0],[0,0,0,0,1,1,1,1,1,1,0,0,0,0,0],[0,0,0,1,1,1,1,1,1,1,0,0,0,0,0],[0,0,0,0,0,1,1,1,1,1,0,0,0,0,0],[1,0,0,0,0,0,0,1,1,1,1,0,0,0,0],[1,1,0,0,0,0,0,0,0,1,1,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,1,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,1],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,1],[1,1,1,1,1,1,1,1,0,0,0,0,0,1,1],[1,1,1,1,1,1,0,0,0,0,0,0,1,1,1],[1,1,1,1,1,0,0,0,0,0,0,1,1,1,1],[1,1,1,0,0,0,0,0,0,0,1,1,1,1,1],[1,1,0,0,0,0,0,0,0,0,1,1,1,1,1],[1,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,1,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,0,0,0],[1,1,1,1,1,1,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,1,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,1,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,1,1,0,0,0,0,1,1,1,1],[0,0,0,0,0,1,1,1,0,0,0,0,1,1,1],[0,0,0,0,0,1,1,1,1,0,0,0,0,1,1],[0,0,0,0,0,1,1,1,1,1,0,0,0,0,1],[0,0,0,0,0,1,1,1,0,0,0,0,0,0,1],[0,0,0,0,0,1,1,0,0,0,0,0,0,0,0],[0,0,0,0,0,1,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,0,0,0,0],[1,1,1,1,1,1,1,1,1,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,1],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,1],[1,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,1,1,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,0,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,0,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,1,1,1,0,0,0],[1,1,1,1,1,1,1,1,1,1,0,0,0,0,0],[1,1,1,1,1,1,1,1,1,0,0,0,0,0,0],[1,1,1,1,1,1,1,1,0,0,0,0,0,0,0],[1,1,1,1,1,1,1,0,0,0,0,0,0,0,1],[1,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}