Compare commits

..

No commits in common. "73412b27f8e2ad89582a24f78186edebac22e37e" and "dd703c3221d1af4647571ddf47c4e4fa62182877" have entirely different histories.

4 changed files with 2 additions and 54 deletions

View File

@ -1,31 +0,0 @@
#include "camera.h"
#include <cmath>
#include <SFML/Graphics/Color.hpp>
#define PI 3.14159265
static void drawLine(sf::RenderWindow* window, sf::Vector2f pos, float angle, float length, sf::Color color);
void camera_update(Camera* camera, sf::RenderWindow* window)
{
if (!camera || !window) return;
drawLine(window, camera->pos, camera->direction, 100, sf::Color::Red);
}
static void drawLine(sf::RenderWindow* window, sf::Vector2f pos, float angle, float length, sf::Color color)
{
if (!window) return;
sf::Vector2f endOffset(length * cos(angle * PI/180.f), length * sin(angle * PI/180.3));
sf::Vertex start(pos);
sf::Vertex end(pos + endOffset);
start.color = color;
end.color = color;
sf::Vertex line[] = { start, end };
window->draw(line, 2, sf::Lines);
}

View File

@ -1,17 +0,0 @@
#ifndef CAMERA_H
#define CAMERA_H
#include <SFML/Graphics/RenderWindow.hpp>
#include <SFML/System/Vector2.hpp>
typedef struct
{
sf::Vector2f pos;
float direction;
float resolution;
float fov;
} Camera;
void camera_update(Camera* camera, sf::RenderWindow* window);
#endif

View File

@ -11,7 +11,7 @@ LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system
.PHONY: all run clean
all: $(TARGET)
all: $(TARGET) $(OBJD)
$(TARGET): $(OBJS)
$(CC) $^ -o $(TARGET) $(LDFLAGS) $(CCFLAGS)
@ -23,6 +23,6 @@ $(OBJS): $(OBJD)/%.o: %.cpp
clean:
rm -r $(TARGET) $(OBJD)
run: main
run:
./$(TARGET)

View File

@ -3,15 +3,12 @@
#include <stdio.h>
#include "level.h"
#include "camera.h"
static int handleKeyCode(sf::Keyboard::Key key);
static sf::Uint32 style = sf::Style::Titlebar;
static sf::RenderWindow window(sf::VideoMode(500, 500), "Raycasting", style);
static Camera camera = { sf::Vector2f(300.f, 250.f), 0.f, 1.f, 70.f };
int view_init()
{
printf("view_init()\n");
@ -38,7 +35,6 @@ int view_update()
window.clear();
if (!level_update()) return 0;
camera_update(&camera, &window);
window.display();
return 1;