- Added card stacks

- Added 'ok'-button on card view
- Resize white circles and red border
- Upgraded pixi.js from 5.1.3 to 6.0.4
- Refactoring
This commit is contained in:
Administrator 2021-06-05 17:46:31 +02:00
parent 83855f9acd
commit 3fe1fbccb4
3 changed files with 121 additions and 50 deletions

BIN
public/img/card_stack.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 KiB

View File

@ -37,7 +37,7 @@
</footer>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/5.1.3/pixi.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/6.0.2/browser/pixi.js"></script>
<script src="js/chat.js"></script>
<script src="js/game.js"></script>
<script src="js/index.js"></script>

View File

@ -1,19 +1,3 @@
let game = document.getElementById('game');
let game_board_size = calculate_size();
let sprite_size = Math.floor(game_board_size / 11);
const app = new PIXI.Application({
autoResize: true,
resolution: devicePixelRatio,
transparent: true,
width: game_board_size,
height: game_board_size
});
document.getElementById('game').appendChild(app.view);
function Sprite(x, y) {
this.sprite = PIXI.Sprite.from('/img/sprite.jpg');
this.coord_x = x;
@ -37,6 +21,22 @@ function Sprite(x, y) {
}
let game = document.getElementById('game');
let game_board_size = calculate_size();
let sprite_size = Math.floor(game_board_size / 11);
const app = new PIXI.Application({
autoResize: true,
resolution: devicePixelRatio,
backgroundAlpha: 0,
width: game_board_size,
height: game_board_size
});
document.getElementById('game').appendChild(app.view);
// fields
let sprites = {
0: new Sprite(1, 1),
1: new Sprite(3, 1),
@ -60,63 +60,120 @@ let sprites = {
15: new Sprite(9, 9),
}
for (let i = 0; i < 16; i++) {
app.stage.addChild(sprites[i].getSprite());
}
for (let i = 0; i < 16; i++) app.stage.addChild(sprites[i].getSprite());
const red_border = new PIXI.Graphics();
red_border.lineStyle(10, 0x862323, 1);
red_border.drawRect(sprite_size * 9 - sprite_size * 0.2, sprite_size * 9 - sprite_size * 0.2, sprite_size * 1.5, sprite_size * 1.5);
// Red border
let red_border = generate_red_border(new PIXI.Graphics());
app.stage.addChild(red_border);
const first_circle = new PIXI.Graphics();
first_circle.lineStyle(0);
first_circle.beginFill(0xffffff, 1);
first_circle.drawCircle(sprite_size * 3 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size * 9 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size/4);
first_circle.endFill();
// White circles
let first_circle = generate_circle(new PIXI.Graphics(), 3, 9);
app.stage.addChild(first_circle);
const second_circle = new PIXI.Graphics();
second_circle.lineStyle(0);
second_circle.beginFill(0xffffff, 1);
second_circle.drawCircle(sprite_size * 5 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size * 9 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size/4);
second_circle.endFill();
let second_circle = generate_circle(new PIXI.Graphics(), 5, 9);
app.stage.addChild(second_circle);
const third_circle = new PIXI.Graphics();
third_circle.lineStyle(0);
third_circle.beginFill(0xffffff, 1);
third_circle.drawCircle(sprite_size * 7 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size * 9 - sprite_size * 0.2 + sprite_size * 0.75, sprite_size/4);
third_circle.endFill();
let third_circle = generate_circle(new PIXI.Graphics(), 7, 9);
app.stage.addChild(third_circle);
generate_card("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores.");
// Card stacks
let cards_1 = generate_card_stack(PIXI.Sprite.from('/img/card_stack.png'), 3, 3, function () {
console.log("1");
generate_card("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores.");
});
app.stage.addChild(cards_1);
let cards_2 = generate_card_stack(PIXI.Sprite.from('/img/card_stack.png'), 5, 3, function () {
console.log("2");
generate_card("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores.");
});
app.stage.addChild(cards_2);
let cards_3 = generate_card_stack(PIXI.Sprite.from('/img/card_stack.png'), 7, 3, function () {
console.log("3");
generate_card("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores.");
});
app.stage.addChild(cards_3);
function generate_card_stack(sprite, x, y, onclick) {
sprite.x = sprite_size * x - sprite_size * 0.2;
sprite.y = sprite_size * y - sprite_size * 0.2;
sprite.width = sprite_size * 1.5;
sprite.height = sprite_size * 3 * 0.72;
sprite.interactive = true;
sprite.on('click', onclick);
return sprite
}
function generate_red_border(graphics) {
graphics.lineStyle(sprite_size * 0.10, 0x862323, 1);
graphics.drawRect(sprite_size * 9 - sprite_size * 0.2, sprite_size * 9 - sprite_size * 0.2, sprite_size * 1.5, sprite_size * 1.5);
return graphics;
}
function generate_circle(graphics, x, y) {
graphics.lineStyle(0);
graphics.beginFill(0xffffff, 1);
graphics.drawCircle(sprite_size * x - sprite_size * 0.2 + sprite_size * 0.75, sprite_size * y - sprite_size * 0.2 + sprite_size * 0.75, sprite_size / 4);
graphics.endFill();
return graphics;
}
function generate_card(s) {
const card = new PIXI.Graphics();
let start_x = game_board_size / 2 - 110;
let start_y = game_board_size / 2 - 150;
let start_x = game_board_size * 0.25 + 2.5;
let start_y = game_board_size / 2 - game_board_size * 0.72 / 2 + 2.5;
card.lineStyle(5, 0x000000, 1);
card.beginFill(0x650A5A);
card.drawRoundedRect(start_x, start_y, 220, 300, 10);
card.beginFill(0xffffff);
card.drawRoundedRect(start_x, start_y, game_board_size * 0.5, game_board_size * 0.72, 10);
card.endFill();
const style = new PIXI.TextStyle({
fontFamily: 'Arial',
fontSize: 15,
wordWrap: true,
wordWrapWidth: 200,
wordWrapWidth: game_board_size * 0.5 - 10,
});
const basicText = new PIXI.Text(s, style);
basicText.x = start_x + 10;
basicText.y = start_y + 10;
card.addChild(basicText);
// const answer_1 = new PIXI.Text(s, style);
// answer_1.x = start_x + 10;
// answer_1.y = start_y + 100;
// card.addChild(answer_1);
// OK-Button
const ok = new PIXI.Graphics();
ok.lineStyle(2, 0x000000, 1);
ok.beginFill(0xffffff);
ok.drawRect(start_x, start_y, game_board_size * 0.5 - 20, 50);
ok.endFill();
ok.x = 10;
ok.y = game_board_size * 0.72 - 60;
card.addChild(ok);
const ok_text = new PIXI.Text('OK', style);
ok_text.x = start_x + ok.x + ok.width / 2 - ok_text.width / 2;
ok_text.y = start_y + ok.y + ok.height / 2 - ok_text.height / 2;
card.addChild(ok_text);
ok.interactive = true;
ok.on('click', function () {
console.log("OK");
});
app.stage.addChild(card);
}
function calculate_size() {
if (game.offsetWidth > game.offsetHeight) {
return game.offsetHeight;
@ -124,14 +181,14 @@ function calculate_size() {
return game.offsetWidth;
}
}
// ------------------------------------ end code ------------------------------------
// Resize
window.addEventListener('resize', resize);
function resize() {
game_board_size = calculate_size();
sprite_size = Math.floor(game_board_size / 11);
// Resize container
app.renderer.resize(game_board_size, game_board_size);
@ -142,10 +199,24 @@ function resize() {
}
// Resize red border
// TODO
red_border.clear();
red_border = generate_red_border(new PIXI.Graphics());
app.stage.addChild(red_border);
// Resize first circle
// TODO
// Resize circles
first_circle.clear();
first_circle = generate_circle(new PIXI.Graphics(), 3, 9);
app.stage.addChild(first_circle);
second_circle.clear();
second_circle = generate_circle(new PIXI.Graphics(), 5, 9);
app.stage.addChild(second_circle);
third_circle.clear();
third_circle = generate_circle(new PIXI.Graphics(), 7, 9);
app.stage.addChild(third_circle);
// TODO card and card stacks
}
resize();