Changeset 2818


Ignore:
Timestamp:
Jul 25, 2013, 12:38:54 AM (4 years ago)
Author:
sam
Message:

build: fix a few compilation issues with input v2.

Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r2803 r2818  
    3636*-stamp
    3737lolengine-*.tar.*
     38test-suite.log
    3839# Personal stuff
    3940patch-*.diff
     
    9798doc/latex
    9899doc/man
    99 
     100# Our test suites
     101test/testsuite.log
     102test/testsuite.trs
  • trunk/demos/tutorial/07_input.cpp

    r2816 r2818  
    122122        }
    123123
    124         mat4 anim = mat4::rotate(m_yaw_angle, vec3(0, 1, 0)) * mat4::rotate(m_pitch_angle, vec3(1, 0, 0));
     124        mat4 anim = mat4::fromeuler_yxz(m_yaw_angle, m_pitch_angle, 0.f);
    125125        mat4 model = mat4::translate(vec3(0, 0, -4.5));
    126126        mat4 view = mat4::lookat(vec3(0, 2, 0), vec3(0, 0, -4), vec3(0, 1, 0));
  • trunk/demos/tutorial/Makefile.am

    r2810 r2818  
    33
    44noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
    5                   06_sprite 08_fbo 11_fractal \
     5                  06_sprite 07_input 08_fbo 11_fractal \
    66                  12_voronoi
    77
  • trunk/src/Makefile.am

    r2750 r2818  
    8585    input/keyboard.cpp input/keyboard.h \
    8686    input/stick.cpp input/stick.h \
     87    input/inputdevice.cpp input/inputdevice.h input/inputdevice_internal.h \
     88    input/controller.cpp input/controller.h \
    8789    \
    8890    gpu/defaultmaterial.lolfx \
  • trunk/src/eglapp.cpp

    r2816 r2818  
    252252
    253253#   if defined USE_SDL
     254#       if defined LOL_INPUT_V2
     255    new SdlInput(res.x, res.y, data->screen_size.x, data->screen_size.y);
     256#       else
    254257    new SdlInput();
     258#       endif
    255259#   endif
    256260
  • trunk/src/input/controller.cpp

    r2816 r2818  
    99//
    1010
    11 #ifdef LOL_INPUT_V2
    12 
    1311#if defined HAVE_CONFIG_H
    1412#   include "config.h"
     
    1614
    1715#include "core.h"
     16
     17#ifdef LOL_INPUT_V2
    1818
    1919namespace lol
  • trunk/src/input/controller.h

    r2816 r2818  
    1212#define __LOL_INPUT_CONTROLLER_H__
    1313
     14#include "core.h"
     15
    1416#if defined LOL_INPUT_V2
    15 
    16 #include "core.h"
    1717
    1818namespace lol
     
    2222{
    2323public:
    24     KeyBinding() : m_current(false), m_previous(false), m_device(nullptr) {}
     24    KeyBinding() : m_device(nullptr), m_current(false), m_previous(false) {}
    2525
    2626    bool IsDown() const { return m_current; }
     
    4545{
    4646public:
    47     AxisBinding() : m_current(0.0f), m_previous(0.0f), m_device(nullptr) {}
     47    AxisBinding() : m_device(nullptr), m_current(0.0f), m_previous(0.0f) {}
    4848
    4949    float GetValue() const { return m_current; }
  • trunk/src/input/input.cpp

    r2816 r2818  
    99//
    1010
    11 #ifndef LOL_INPUT_V2
    1211
    1312#if defined HAVE_CONFIG_H
     
    1817
    1918#include "core.h"
     19
     20#ifndef LOL_INPUT_V2
    2021
    2122namespace lol
  • trunk/src/input/input.h

    r2816 r2818  
    1717#define __LOL_INPUT_INPUT_H__
    1818
    19 #ifndef LOL_INPUT_V2
    20 
    2119#include <cstring>
    2220#include <string.h>
    2321
    2422#include "core.h"
     23
     24#ifndef LOL_INPUT_V2
    2525
    2626#include "lol/math/vector.h"
  • trunk/src/input/inputdevice.cpp

    r2816 r2818  
    99//
    1010
    11 #ifdef LOL_INPUT_V2
    12 
    1311#if defined HAVE_CONFIG_H
    1412#   include "config.h"
     
    1614
    1715#include "core.h"
     16
     17#ifdef LOL_INPUT_V2
    1818
    1919#include "input/inputdevice_internal.h"
  • trunk/src/input/inputdevice.h

    r2816 r2818  
    1212#define __LOL_INPUT_DEVICE_H__
    1313
     14#include "core.h"
     15
    1416#if defined LOL_INPUT_V2
    15 
    16 #include "core.h"
    1717
    1818namespace lol
  • trunk/src/input/inputdevice_internal.h

    r2816 r2818  
    1212#define __LOL_INPUT_DEVICE_H__
    1313
     14#include "core.h"
     15
    1416#if defined LOL_INPUT_V2
    15 
    16 #include "core.h"
    1717
    1818namespace lol
  • trunk/src/input/keyboard.cpp

    r2816 r2818  
    99//
    1010
    11 #ifndef LOL_INPUT_V2
    12 
    1311#if defined HAVE_CONFIG_H
    1412#   include "config.h"
     
    1816
    1917#include "core.h"
     18
     19#ifndef LOL_INPUT_V2
    2020
    2121namespace lol
  • trunk/src/input/keyboard.h

    r2816 r2818  
    1717#define __LOL_INPUT_KEYBOARD_H__
    1818
     19#include "entity.h"
     20
    1921#ifndef LOL_INPUT_V2
    20 
    21 #include "entity.h"
    2222
    2323namespace lol
  • trunk/src/input/stick.cpp

    r2816 r2818  
    99//
    1010
    11 #ifndef LOL_INPUT_V2
    12 
    1311#if defined HAVE_CONFIG_H
    1412#   include "config.h"
     
    1816
    1917#include "core.h"
     18
     19#ifndef LOL_INPUT_V2
    2020
    2121namespace lol
  • trunk/src/input/stick.h

    r2816 r2818  
    1717#define __LOL_INPUT_STICK_H__
    1818
     19#include "entity.h"
     20
    1921#ifndef LOL_INPUT_V2
    20 
    21 #include "entity.h"
    2222
    2323namespace lol
Note: See TracChangeset for help on using the changeset viewer.