MitchellHansen
8 years ago
parent
03a7ee43fd
commit
3f0a99a435
@ -0,0 +1,50 @@
|
||||
#pragma once
|
||||
#include <SFML/System/Vector3.hpp>
|
||||
#include <SFML/System/Vector2.hpp>
|
||||
#include "util.hpp"
|
||||
#include "Pub_Sub.h"
|
||||
|
||||
class Light : public VrEventSubscriber {
|
||||
public:
|
||||
|
||||
enum DIRECTION { FORWARD, REARWARD, LEFT, RIGHT, UP, DOWN };
|
||||
|
||||
Light();
|
||||
Light(sf::Vector3f position, sf::Vector3f direction);
|
||||
~Light();
|
||||
|
||||
int set_position(sf::Vector3f position);
|
||||
|
||||
int add_static_impulse(sf::Vector3f impulse);
|
||||
int add_relative_impulse(DIRECTION direction, float speed);
|
||||
|
||||
int slew_camera(sf::Vector3f input);
|
||||
void set_camera(sf::Vector3f input);
|
||||
|
||||
int update(double delta_time);
|
||||
|
||||
void look_at_center();
|
||||
|
||||
sf::Vector3f* get_direction_pointer();
|
||||
sf::Vector3f* get_position_pointer();
|
||||
sf::Vector3f* get_movement_pointer();
|
||||
|
||||
sf::Vector3f get_movement();
|
||||
sf::Vector3f get_position();
|
||||
sf::Vector3f get_direction();
|
||||
|
||||
|
||||
void recieve_event(VrEventPublisher* p, std::unique_ptr<vr::Event> event) override;
|
||||
|
||||
private:
|
||||
|
||||
// XYZ
|
||||
sf::Vector3f position;
|
||||
|
||||
sf::Vector3f direction_cartesian;
|
||||
|
||||
sf::Vector4f rgbi;
|
||||
|
||||
|
||||
};
|
||||
|
||||
@ -0,0 +1,138 @@
|
||||
#pragma once
|
||||
#include "Light.h"
|
||||
#include "Pub_Sub.h"
|
||||
|
||||
|
||||
Light::Light() {
|
||||
}
|
||||
|
||||
|
||||
Light::Light(sf::Vector3f position, sf::Vector3f direction) :
|
||||
position(position), direction_cartesian(direction_cartesian)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
Light::~Light() {
|
||||
}
|
||||
|
||||
int Light::set_position(sf::Vector3f position) {
|
||||
this->position = position;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int Light::add_static_impulse(sf::Vector3f impulse) {
|
||||
movement += impulse;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int Light::add_relative_impulse(DIRECTION impulse_direction, float speed) {
|
||||
|
||||
// No sense in doing fancy dot products, adding Pi's will suffice
|
||||
// Always add PI/2 to X initially to avoid negative case
|
||||
sf::Vector2f dir;
|
||||
|
||||
switch (impulse_direction) {
|
||||
|
||||
case DIRECTION::FORWARD:
|
||||
dir = sf::Vector2f(direction_cartesian.y, direction_cartesian.x);
|
||||
break;
|
||||
case DIRECTION::REARWARD:
|
||||
dir = sf::Vector2f(direction_cartesian.y, direction_cartesian.x + PI_F);
|
||||
break;
|
||||
case DIRECTION::LEFT:
|
||||
dir = sf::Vector2f(direction_cartesian.y + PI_F + PI_F / 2, PI_F / 2);
|
||||
break;
|
||||
case DIRECTION::RIGHT:
|
||||
dir = sf::Vector2f(direction_cartesian.y + PI_F / 2, PI_F / 2);
|
||||
break;
|
||||
case DIRECTION::UP:
|
||||
dir = sf::Vector2f(direction_cartesian.y, direction_cartesian.x + PI_F / 2);
|
||||
break;
|
||||
case DIRECTION::DOWN:
|
||||
dir = sf::Vector2f(direction_cartesian.y + PI_F, (direction_cartesian.x * -1) + PI_F / 2);
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
movement += SphereToCart(dir);
|
||||
movement *= speed;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int Light::slew_camera(sf::Vector3f input) {
|
||||
direction_cartesian -= input;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void Light::set_camera(sf::Vector3f input) {
|
||||
direction_cartesian = input;
|
||||
}
|
||||
|
||||
int Light::update(double delta_time) {
|
||||
|
||||
double multiplier = 40;
|
||||
|
||||
position.x += static_cast<float>(movement.x * delta_time * multiplier);
|
||||
position.y += static_cast<float>(movement.y * delta_time * multiplier);
|
||||
position.z += static_cast<float>(movement.z * delta_time * multiplier);
|
||||
|
||||
movement *= static_cast<float>(1.0f * delta_time * multiplier);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void Light::recieve_event(VrEventPublisher* publisher, std::unique_ptr<vr::Event> event) {
|
||||
|
||||
if (event.get()->type == vr::Event::KeyHeld) {}
|
||||
else if (event->type == vr::Event::KeyPressed) {}
|
||||
else if (event->type == vr::Event::MouseMoved) {}
|
||||
|
||||
else if (event->type == vr::Event::JoystickMoved) {
|
||||
|
||||
vr::JoystickMoved *joystick_event = static_cast<vr::JoystickMoved*>(event.get());
|
||||
|
||||
if (joystick_event->axis == sf::Joystick::Axis::X) {
|
||||
movement.x -= joystick_event->position / 5;
|
||||
//add_relative_impulse(Camera::DIRECTION::FORWARD, joystick_event->position);
|
||||
}
|
||||
else if (joystick_event->axis == sf::Joystick::Axis::Y) {
|
||||
movement.y += joystick_event->position / 5;
|
||||
//add_relative_impulse(Camera::DIRECTION::RIGHT, joystick_event->position);
|
||||
}
|
||||
//else if (joystick_event->axis == sf::Joystick::Axis::Z) {
|
||||
// add_relative_impulse(Camera::DIRECTION::DOWN, joystick_event->position);
|
||||
//}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Light::look_at_center() {
|
||||
|
||||
//direction_cartesian = CartToNormalizedSphere(sf::Vector3f(75, 75, 75) - position);
|
||||
}
|
||||
|
||||
sf::Vector3f* Light::get_direction_pointer() {
|
||||
return &direction_cartesian;
|
||||
}
|
||||
|
||||
sf::Vector3f* Light::get_movement_pointer() {
|
||||
return &movement;
|
||||
}
|
||||
|
||||
sf::Vector3f* Light::get_position_pointer() {
|
||||
return &position;
|
||||
}
|
||||
|
||||
sf::Vector3f Light::get_movement() {
|
||||
return movement;
|
||||
}
|
||||
|
||||
sf::Vector3f Light::get_position() {
|
||||
return position;
|
||||
}
|
||||
|
||||
sf::Vector3f Light::get_direction() {
|
||||
return direction_cartesian;
|
||||
}
|
||||
Loading…
Reference in new issue