Changeset 81f28c0 in opengl-game
- Timestamp:
- Jun 10, 2018, 10:35:12 PM (7 years ago)
- Branches:
- feature/imgui-sdl, master, points-test
- Children:
- 20e0020
- Parents:
- 809ce16
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
new-game.cpp
r809ce16 r81f28c0 377 377 obj.shader_program = color_sp; 378 378 obj.points = { 379 0.0f, 0.5f, 0.0f, 380 -0.5f, -0.5f, 0.0f, 381 0.5f, -0.5f, 0.0f, 382 0.5f, -0.5f, 0.0f, 383 -0.5f, -0.5f, 0.0f, 384 0.0f, 0.5f, 0.0f, 379 //back 380 -0.5f, 0.3f, 0.0f, 381 -0.5f, 0.0f, 0.0f, 382 0.5f, 0.0f, 0.0f, 383 -0.5f, 0.3f, 0.0f, 384 0.5f, 0.0f, 0.0f, 385 0.5f, 0.3f, 0.0f, 386 387 // left back 388 -0.5f, 0.3f, -2.0f, 389 -0.5f, 0.0f, -2.0f, 390 -0.5f, 0.0f, 0.0f, 391 -0.5f, 0.3f, -2.0f, 392 -0.5f, 0.0f, 0.0f, 393 -0.5f, 0.3f, 0.0f, 394 395 // right back 396 0.5f, 0.3f, 0.0f, 397 0.5f, 0.0f, 0.0f, 398 0.5f, 0.0f, -2.0f, 399 0.5f, 0.3f, 0.0f, 400 0.5f, 0.0f, -2.0f, 401 0.5f, 0.3f, -2.0f, 402 403 // left mid 404 -0.25f, 0.3f, -3.0f, 405 -0.25f, 0.0f, -3.0f, 406 -0.5f, 0.0f, -2.0f, 407 -0.25f, 0.3f, -3.0f, 408 -0.5f, 0.0f, -2.0f, 409 -0.5f, 0.3f, -2.0f, 410 411 // right mid 412 0.5f, 0.3f, -2.0f, 413 0.5f, 0.0f, -2.0f, 414 0.25f, 0.0f, -3.0f, 415 0.5f, 0.3f, -2.0f, 416 0.25f, 0.0f, -3.0f, 417 0.25f, 0.3f, -3.0f, 418 419 // left front 420 0.0f, 0.0f, -3.5f, 421 -0.25f, 0.0f, -3.0f, 422 -0.25f, 0.3f, -3.0f, 423 424 // right front 425 0.25f, 0.3f, -3.0f, 426 0.25f, 0.0f, -3.0f, 427 0.0f, 0.0f, -3.5f, 428 429 // top back 430 -0.5f, 0.3f, -2.0f, 431 -0.5f, 0.3f, 0.0f, 432 0.5f, 0.3f, 0.0f, 433 -0.5f, 0.3f, -2.0f, 434 0.5f, 0.3f, 0.0f, 435 0.5f, 0.3f, -2.0f, 436 437 // top mid 438 -0.25f, 0.3f, -3.0f, 439 -0.5f, 0.3f, -2.0f, 440 0.5f, 0.3f, -2.0f, 441 -0.25f, 0.3f, -3.0f, 442 0.5f, 0.3f, -2.0f, 443 0.25f, 0.3f, -3.0f, 444 445 // top front 446 -0.25f, 0.3f, -3.0f, 447 0.25f, 0.3f, -3.0f, 448 0.0f, 0.0f, -3.5f, 449 450 // left wing start back 451 -1.5f, 0.3f, 0.0f, 452 -1.5f, 0.0f, 0.0f, 453 -0.5f, 0.0f, 0.0f, 454 -1.5f, 0.3f, 0.0f, 455 -0.5f, 0.0f, 0.0f, 456 -0.5f, 0.3f, 0.0f, 457 458 // left wing start top 459 -0.5f, 0.3f, -0.3f, 460 -1.3f, 0.3f, -0.3f, 461 -1.5f, 0.3f, 0.0f, 462 -0.5f, 0.3f, -0.3f, 463 -1.5f, 0.3f, 0.0f, 464 -0.5f, 0.3f, 0.0f, 465 466 // left wing start front 467 -0.5f, 0.3f, -0.3f, 468 -0.5f, 0.0f, -0.3f, 469 -1.3f, 0.0f, -0.3f, 470 -0.5f, 0.3f, -0.3f, 471 -1.3f, 0.0f, -0.3f, 472 -1.3f, 0.3f, -0.3f, 473 474 // left wing end outside 475 -1.5f, 0.3f, 0.0f, 476 -2.2f, 0.15f, -0.8f, 477 -1.5f, 0.0f, 0.0f, 478 479 // left wing end top 480 -1.3f, 0.3f, -0.3f, 481 -2.2f, 0.15f, -0.8f, 482 -1.5f, 0.3f, 0.0f, 483 484 // left wing end front 485 -1.3f, 0.0f, -0.3f, 486 -2.2f, 0.15f, -0.8f, 487 -1.3f, 0.3f, -0.3f, 385 488 }; 386 489 obj.colors = { … … 391 494 0.0f, 0.0f, 0.3f, 392 495 0.0f, 0.0f, 0.3f, 496 497 0.0f, 0.0f, 0.3f, 498 0.0f, 0.0f, 0.3f, 499 0.0f, 0.0f, 0.3f, 500 0.0f, 0.0f, 0.3f, 501 0.0f, 0.0f, 0.3f, 502 0.0f, 0.0f, 0.3f, 503 504 0.0f, 0.0f, 0.3f, 505 0.0f, 0.0f, 0.3f, 506 0.0f, 0.0f, 0.3f, 507 0.0f, 0.0f, 0.3f, 508 0.0f, 0.0f, 0.3f, 509 0.0f, 0.0f, 0.3f, 510 511 0.0f, 0.0f, 0.3f, 512 0.0f, 0.0f, 0.3f, 513 0.0f, 0.0f, 0.3f, 514 0.0f, 0.0f, 0.3f, 515 0.0f, 0.0f, 0.3f, 516 0.0f, 0.0f, 0.3f, 517 518 0.0f, 0.0f, 0.3f, 519 0.0f, 0.0f, 0.3f, 520 0.0f, 0.0f, 0.3f, 521 0.0f, 0.0f, 0.3f, 522 0.0f, 0.0f, 0.3f, 523 0.0f, 0.0f, 0.3f, 524 525 0.0f, 0.0f, 0.3f, 526 0.0f, 0.0f, 0.3f, 527 0.0f, 0.0f, 0.3f, 528 529 0.0f, 0.0f, 0.3f, 530 0.0f, 0.0f, 0.3f, 531 0.0f, 0.0f, 0.3f, 532 533 0.0f, 0.0f, 0.3f, 534 0.0f, 0.0f, 0.3f, 535 0.0f, 0.0f, 0.3f, 536 0.0f, 0.0f, 0.3f, 537 0.0f, 0.0f, 0.3f, 538 0.0f, 0.0f, 0.3f, 539 540 0.0f, 0.0f, 0.3f, 541 0.0f, 0.0f, 0.3f, 542 0.0f, 0.0f, 0.3f, 543 0.0f, 0.0f, 0.3f, 544 0.0f, 0.0f, 0.3f, 545 0.0f, 0.0f, 0.3f, 546 547 0.0f, 0.0f, 0.3f, 548 0.0f, 0.0f, 0.3f, 549 0.0f, 0.0f, 0.3f, 550 551 0.0f, 0.0f, 0.3f, 552 0.0f, 0.0f, 0.3f, 553 0.0f, 0.0f, 0.3f, 554 0.0f, 0.0f, 0.3f, 555 0.0f, 0.0f, 0.3f, 556 0.0f, 0.0f, 0.3f, 557 558 0.0f, 0.0f, 0.3f, 559 0.0f, 0.0f, 0.3f, 560 0.0f, 0.0f, 0.3f, 561 0.0f, 0.0f, 0.3f, 562 0.0f, 0.0f, 0.3f, 563 0.0f, 0.0f, 0.3f, 564 565 0.0f, 0.0f, 0.3f, 566 0.0f, 0.0f, 0.3f, 567 0.0f, 0.0f, 0.3f, 568 0.0f, 0.0f, 0.3f, 569 0.0f, 0.0f, 0.3f, 570 0.0f, 0.0f, 0.3f, 571 572 0.0f, 0.0f, 0.3f, 573 0.0f, 0.0f, 0.3f, 574 0.0f, 0.0f, 0.3f, 575 576 0.0f, 0.0f, 0.3f, 577 0.0f, 0.0f, 0.3f, 578 0.0f, 0.0f, 0.3f, 579 580 0.0f, 0.0f, 0.3f, 581 0.0f, 0.0f, 0.3f, 582 0.0f, 0.0f, 0.3f, 393 583 }; 394 584 obj.texcoords = { … … 399 589 0.0f, 0.0f, 400 590 1.0f, 0.0f, 591 592 1.0f, 1.0f, 593 0.0f, 1.0f, 594 0.0f, 0.0f, 595 1.0f, 1.0f, 596 0.0f, 0.0f, 597 1.0f, 0.0f, 598 599 1.0f, 1.0f, 600 0.0f, 1.0f, 601 0.0f, 0.0f, 602 1.0f, 1.0f, 603 0.0f, 0.0f, 604 1.0f, 0.0f, 605 606 1.0f, 1.0f, 607 0.0f, 1.0f, 608 0.0f, 0.0f, 609 1.0f, 1.0f, 610 0.0f, 0.0f, 611 1.0f, 0.0f, 612 613 1.0f, 1.0f, 614 0.0f, 1.0f, 615 0.0f, 0.0f, 616 1.0f, 1.0f, 617 0.0f, 0.0f, 618 1.0f, 0.0f, 619 620 1.0f, 1.0f, 621 0.0f, 1.0f, 622 0.0f, 0.0f, 623 624 1.0f, 1.0f, 625 0.0f, 1.0f, 626 0.0f, 0.0f, 627 628 1.0f, 1.0f, 629 0.0f, 1.0f, 630 0.0f, 0.0f, 631 1.0f, 1.0f, 632 0.0f, 0.0f, 633 1.0f, 0.0f, 634 635 1.0f, 1.0f, 636 0.0f, 1.0f, 637 0.0f, 0.0f, 638 1.0f, 1.0f, 639 0.0f, 0.0f, 640 1.0f, 0.0f, 641 642 1.0f, 1.0f, 643 0.0f, 1.0f, 644 0.0f, 0.0f, 645 646 1.0f, 1.0f, 647 0.0f, 1.0f, 648 0.0f, 0.0f, 649 1.0f, 1.0f, 650 0.0f, 0.0f, 651 1.0f, 0.0f, 652 653 1.0f, 1.0f, 654 0.0f, 1.0f, 655 0.0f, 0.0f, 656 1.0f, 1.0f, 657 0.0f, 0.0f, 658 1.0f, 0.0f, 659 660 1.0f, 1.0f, 661 0.0f, 1.0f, 662 0.0f, 0.0f, 663 1.0f, 1.0f, 664 0.0f, 0.0f, 665 1.0f, 0.0f, 666 667 1.0f, 1.0f, 668 0.0f, 1.0f, 669 0.0f, 0.0f, 670 671 1.0f, 1.0f, 672 0.0f, 1.0f, 673 0.0f, 0.0f, 674 675 1.0f, 1.0f, 676 0.0f, 1.0f, 677 0.0f, 0.0f, 401 678 }; 402 679 obj.selected_colors = { … … 481 758 482 759 cam_pos = vec3(0.0f, 0.0f, 2.0f); 760 //cam_pos = vec3(-2.1f, -1.5f, -1.5f); // Good position for checking ship faces 483 761 float cam_yaw = 0.0f * 2.0f * 3.14159f / 360.0f; 484 762 float cam_pitch = 0.0f * 2.0f * 3.14159f / 360.0f;
Note:
See TracChangeset
for help on using the changeset viewer.