Daniele Bartolini пре 11 година
родитељ
комит
6d50e5a58f

+ 2 - 6
engine/audio/sound_world_al.cpp

@@ -24,20 +24,16 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <AL/al.h>
-#include <AL/alc.h>
-
 #include "sound_world.h"
 #include "id_array.h"
-#include "allocator.h"
 #include "vector3.h"
 #include "matrix4x4.h"
-#include "resource.h"
 #include "sound_resource.h"
-#include "container_types.h"
 #include "temp_allocator.h"
 #include "log.h"
 #include "audio.h"
+#include <AL/al.h>
+#include <AL/alc.h>
 
 namespace crown
 {

+ 2 - 6
engine/audio/sound_world_sles.cpp

@@ -24,20 +24,16 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-
 #include "sound_world.h"
 #include "id_array.h"
-#include "allocator.h"
 #include "vector3.h"
 #include "matrix4x4.h"
-#include "resource.h"
 #include "sound_resource.h"
-#include "container_types.h"
 #include "temp_allocator.h"
 #include "queue.h"
 #include "audio.h"
+#include <SLES/OpenSLES.h>
+#include <SLES/OpenSLES_Android.h>
 
 namespace crown
 {

+ 0 - 1
engine/compilers/bundle_compiler.cpp

@@ -34,7 +34,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "resource.h"
 #include "path.h"
 #include "disk_filesystem.h"
-#include "temp_allocator.h"
 #include "compile_options.h"
 #include <inttypes.h>
 

+ 1 - 1
engine/compilers/bundle_compiler.h

@@ -27,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include "filesystem.h"
-#include "vector.h"
+#include "container_types.h"
 #include "crown.h"
 
 namespace crown

+ 1 - 3
engine/input/mouse.h

@@ -26,9 +26,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include <cstring>
 #include "types.h"
 #include "vector2.h"
+#include <cstring> // mem*
 
 namespace crown
 {
@@ -53,8 +53,6 @@ struct MouseButton
 /// @ingroup Input
 struct Mouse
 {
-public:
-
 	//-----------------------------------------------------------------------------
 	Mouse()
 		: m_last_button(MouseButton::NONE)

+ 1 - 2
engine/input/touch.h

@@ -28,6 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "types.h"
 #include "vector2.h"
+#include <cstring> // mem*
 
 namespace crown
 {
@@ -42,8 +43,6 @@ const uint32_t MAX_POINTER_IDS = 4;
 /// @ingroup Input
 struct Touch
 {
-public:
-
 	//-----------------------------------------------------------------------------
 	Touch()
 		: m_last_pointer(0xFF)