OctaForge
/
OctaCore
1
1
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

move ents to engine/

master
Daniel Kolesa 2020-07-29 05:23:45 +02:00
parent 50d6e0c86b
commit 12020c5daf
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine/bih.cc
View File

@ -1,5 +1,4 @@
#include <shared/ents.hh> #include "ents.hh"
#include "physics.hh" #include "physics.hh"
#include "rendermodel.hh" // loadmapmodel #include "rendermodel.hh" // loadmapmodel
#include "stain.hh" #include "stain.hh"

4
src/shared/ents.hh → src/engine/ents.hh
View File

@ -1,5 +1,5 @@
#ifndef SHARED_ENTS_HH #ifndef ENGINE_ENTS_HH
#define SHARED_ENTS_HH #define ENGINE_ENTS_HH
#include "tools.hh" #include "tools.hh"
#include "geom.hh" #include "geom.hh"

3
src/engine/octa.hh
View File

@ -3,7 +3,8 @@
#include <shared/gl.hh> #include <shared/gl.hh>
#include <shared/geom.hh> #include <shared/geom.hh>
#include <shared/ents.hh>
#include "ents.hh"
struct vertex { vec pos; bvec4 norm; vec tc; bvec4 tangent; }; struct vertex { vec pos; bvec4 norm; vec tc; bvec4 tangent; };

2
src/engine/physics.cc
View File

@ -6,10 +6,10 @@
#include "physics.hh" #include "physics.hh"
#include <shared/command.hh> #include <shared/command.hh>
#include <shared/ents.hh>
#include <shared/igame.hh> #include <shared/igame.hh>
#include "console.hh" /* conoutf */ #include "console.hh" /* conoutf */
#include "ents.hh"
#include "main.hh" // player, timings #include "main.hh" // player, timings
#include "rendergl.hh" // camera1 #include "rendergl.hh" // camera1
#include "rendermodel.hh" #include "rendermodel.hh"

1
src/engine/world.hh
View File

@ -2,7 +2,6 @@
#define ENGINE_WORLD_HH #define ENGINE_WORLD_HH
#include <shared/geom.hh> #include <shared/geom.hh>
#include <shared/ents.hh>
/* FIXME: move these defines/enums */ /* FIXME: move these defines/enums */