Skip to content

Commit ec567cd

Browse files
committed
Merge pull request #33 from Databean/move_dice_again
Move dice again
2 parents a06e423 + ce7e273 commit ec567cd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/GameView.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ using std::unique_ptr;
1919

2020
float DiceXCoords[3] = {9.f, 134.f, 259.f};
2121
float DiceYCoords[2] = {3.f, 142.f};
22-
std::pair<float, float> lDieScreenLoc= make_pair(0.7f, 0.8f);
23-
std::pair<float, float> rDieScreenLoc= make_pair(0.78f, 0.8f);
22+
std::pair<float, float> lDieScreenLoc= make_pair(0.6f, 0.82f);
23+
std::pair<float, float> rDieScreenLoc= make_pair(0.68f, 0.82f);
2424

2525
#define DIE_SIDE_LENGTH 0.06f
26-
#define DIE_SCREEN_SIDE_LENGTH 95.f
26+
#define DIE_SCREEN_SIDE_LENGTH 105.f
2727

2828
#define EMPLACE_SQUARE_VERTEX(imXOff, imYOff, scXOff, scYOff) \
2929
texCoordPair({texTopLeft.first + imXOff, texTopLeft.second + imYOff}); \

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void initOpenGL() {
3737
* @param width The new width of the viewport.
3838
* @param height The new height of the viewport.
3939
*/
40-
int updateViewport(int width, int height) {
40+
void updateViewport(int width, int height) {
4141
glViewport(0, 0, width, height);
4242
glMatrixMode(GL_PROJECTION);
4343
glLoadIdentity ();

0 commit comments

Comments
 (0)