Skip to content
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

fix: fix wonky level editor #1609

Merged
merged 4 commits into from
May 13, 2024
Merged

fix: fix wonky level editor #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38b0d2a
move trash can
evemartin May 8, 2024
d9a07c3
fix screen ratio to display whole grid
evemartin May 8, 2024
38a8488
modify grid size
evemartin May 8, 2024
c0861b3
Merge branch 'master' into fix-wonky-level-editor
evemartin May 13, 2024
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
8 changes: 4 additions & 4 deletions game/static/game/js/drawing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ var GRID_SPACE_SIZE = 100
let PAPER_WIDTH = GRID_SPACE_SIZE * GRID_WIDTH
let PAPER_HEIGHT = GRID_SPACE_SIZE * GRID_HEIGHT
let PAPER_PADDING = 30
let EXTENDED_PAPER_WIDTH = '100%'
let EXTENDED_PAPER_HEIGHT = '100%'
let EXTENDED_PAPER_WIDTH = PAPER_WIDTH + 2 * PAPER_PADDING
let EXTENDED_PAPER_HEIGHT = PAPER_WIDTH + 2 * PAPER_PADDING

let DEFAULT_CHARACTER_WIDTH = 40
let DEFAULT_CHARACTER_HEIGHT = 20
Expand Down Expand Up @@ -74,8 +74,8 @@ ocargo.Drawing = function (startingPosition) {
paper.setViewBox(
currentStartX,
currentStartY,
1000,
800
1060,
1000
)

/**
Expand Down
4 changes: 2 additions & 2 deletions game/static/game/js/level_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,8 +975,8 @@ ocargo.LevelEditor = function(levelId) {
var windowWidth = $(window).width();
var windowHeight = $(window).height();

var paperRightEdge = PAPER_WIDTH + $('#tools').width();
var paperBottomEdge = PAPER_HEIGHT;
var paperRightEdge = EXTENDED_PAPER_WIDTH + $('#tools').width();
var paperBottomEdge = EXTENDED_PAPER_HEIGHT;

var bottom = 50;
if(windowHeight > paperBottomEdge) {
Expand Down
Loading