Permalink
Browse files

Got rid of the PCH file.

Also removed some threading dead code.
  • Loading branch information...
1 parent a182b3e commit 3e7355b3c19a7b759250b30649a0e7d63bc15859 @Bertram25 Bertram25 committed Nov 9, 2017
Showing with 334 additions and 566 deletions.
  1. +0 −27 src/CMakeLists.txt
  2. +0 −1 src/common/common.cpp
  3. +0 −2 src/common/common_bindings.cpp
  4. +0 −1 src/common/dialogue.cpp
  5. +0 −1 src/common/global/battle_media.cpp
  6. +0 −1 src/common/global/global.cpp
  7. +0 −1 src/common/global/global_actors.cpp
  8. +0 −1 src/common/global/global_effects.cpp
  9. +2 −1 src/common/global/global_event_group.h
  10. +0 −1 src/common/global/global_objects.cpp
  11. +0 −1 src/common/global/global_skills.cpp
  12. +0 −1 src/common/global/global_utils.cpp
  13. +4 −1 src/common/global/global_utils.h
  14. +0 −1 src/common/gui/gui.cpp
  15. +2 −0 src/common/gui/gui.h
  16. +0 −1 src/common/gui/menu_window.cpp
  17. +5 −3 src/common/gui/option.cpp
  18. +4 −24 src/common/gui/textbox.cpp
  19. +0 −193 src/common/include_pch.h
  20. +0 −1 src/common/message_window.cpp
  21. +0 −1 src/common/options_handler.cpp
  22. +15 −1 src/engine/audio/audio.cpp
  23. +5 −11 src/engine/audio/audio.h
  24. +17 −21 src/engine/audio/audio_descriptor.cpp
  25. +14 −11 src/engine/audio/audio_descriptor.h
  26. +0 −1 src/engine/audio/audio_effects.cpp
  27. +14 −1 src/engine/audio/audio_input.cpp
  28. +9 −12 src/engine/audio/audio_input.h
  29. +0 −1 src/engine/audio/audio_stream.cpp
  30. +0 −1 src/engine/effect_supervisor.cpp
  31. +2 −0 src/engine/effect_supervisor.h
  32. +2 −2 src/engine/engine_bindings.cpp
  33. +0 −1 src/engine/indicator_supervisor.cpp
  34. +0 −1 src/engine/input.cpp
  35. +4 −0 src/engine/input.h
  36. +0 −1 src/engine/mode_manager.cpp
  37. +0 −1 src/engine/script_supervisor.cpp
  38. +10 −90 src/engine/system.cpp
  39. +4 −13 src/engine/system.h
  40. +2 −0 src/engine/video/color.h
  41. +0 −1 src/engine/video/fade.cpp
  42. +4 −5 src/engine/video/gl/gl_particle_system.cpp
  43. +7 −3 src/engine/video/gl/gl_particle_system.h
  44. +2 −1 src/engine/video/gl/gl_render_target.cpp
  45. +5 −3 src/engine/video/gl/gl_render_target.h
  46. +3 −1 src/engine/video/gl/gl_shader.cpp
  47. +7 −3 src/engine/video/gl/gl_shader.h
  48. +3 −3 src/engine/video/gl/gl_shader_definitions.h
  49. +3 −1 src/engine/video/gl/gl_shader_program.cpp
  50. +8 −3 src/engine/video/gl/gl_shader_program.h
  51. +3 −3 src/engine/video/gl/gl_shader_programs.h
  52. +3 −3 src/engine/video/gl/gl_shaders.h
  53. +2 −1 src/engine/video/gl/gl_sprite.cpp
  54. +5 −3 src/engine/video/gl/gl_sprite.h
  55. +4 −1 src/engine/video/gl/gl_transform.cpp
  56. +6 −6 src/engine/video/gl/gl_transform.h
  57. +7 −6 src/engine/video/gl/gl_vector.cpp
  58. +10 −10 src/engine/video/gl/gl_vector.h
  59. +2 −1 src/engine/video/image.cpp
  60. +6 −1 src/engine/video/image_base.cpp
  61. +3 −0 src/engine/video/image_base.h
  62. +2 −1 src/engine/video/interpolator.cpp
  63. +2 −0 src/engine/video/interpolator.h
  64. +0 −1 src/engine/video/particle_effect.cpp
  65. +0 −1 src/engine/video/particle_manager.cpp
  66. +4 −0 src/engine/video/particle_manager.h
  67. +2 −1 src/engine/video/particle_system.cpp
  68. +6 −1 src/engine/video/text.cpp
  69. +2 −0 src/engine/video/text.h
  70. +2 −1 src/engine/video/texture.cpp
  71. +15 −11 src/engine/video/texture.h
  72. +0 −1 src/engine/video/texture_controller.cpp
  73. +2 −0 src/engine/video/texture_controller.h
  74. +0 −1 src/engine/video/video.cpp
  75. +2 −0 src/engine/video/video.h
  76. +2 −0 src/engine/video/video_utils.h
  77. +2 −2 src/main.cpp
  78. +2 −1 src/main_options.cpp
  79. +4 −0 src/main_options.h
  80. +0 −1 src/modes/battle/battle.cpp
  81. +2 −0 src/modes/battle/battle.h
  82. +0 −1 src/modes/battle/battle_actions.cpp
  83. +0 −1 src/modes/battle/battle_actors.cpp
  84. +0 −1 src/modes/battle/battle_command.cpp
  85. +0 −1 src/modes/battle/battle_effects.cpp
  86. +0 −1 src/modes/battle/battle_finish.cpp
  87. +1 −3 src/modes/battle/battle_menu.cpp
  88. +1 −1 src/modes/battle/battle_sequence.cpp
  89. +0 −4 src/modes/battle/battle_sequence.h
  90. +0 −1 src/modes/battle/battle_utils.cpp
  91. +2 −0 src/modes/battle/battle_utils.h
  92. +0 −1 src/modes/boot/boot.cpp
  93. +1 −3 src/modes/map/map_escape.cpp
  94. +0 −1 src/modes/map/map_events.cpp
  95. +2 −0 src/modes/map/map_location.h
  96. +3 −0 src/modes/map/map_minimap.cpp
  97. +0 −1 src/modes/map/map_mode.cpp
  98. +2 −0 src/modes/map/map_sprites/map_sprite.h
  99. +0 −1 src/modes/map/map_status_effects.cpp
  100. +0 −1 src/modes/map/map_tiles.cpp
  101. +2 −1 src/modes/map/map_treasure_content.h
  102. +0 −1 src/modes/map/map_utils.cpp
  103. +0 −2 src/modes/map/map_utils.h
  104. +0 −1 src/modes/map/map_zones.cpp
  105. +0 −1 src/modes/menu/menu_windows/menu_character_window.cpp
  106. +0 −1 src/modes/mode_bindings.cpp
  107. +0 −1 src/modes/mode_help_window.cpp
  108. +0 −1 src/modes/pause.cpp
  109. +0 −1 src/modes/save/save_mode.cpp
  110. +0 −1 src/modes/shop/shop.cpp
  111. +0 −1 src/modes/shop/shop_buy.cpp
  112. +0 −1 src/modes/shop/shop_root.cpp
  113. +0 −1 src/modes/shop/shop_sell.cpp
  114. +0 −1 src/modes/shop/shop_trade.cpp
  115. +0 −1 src/modes/shop/shop_utils.cpp
  116. +3 −2 src/utils/exception.cpp
  117. +3 −1 src/utils/exception.h
  118. +22 −0 src/utils/gl_include.h
  119. +6 −1 src/utils/script/script.cpp
  120. +3 −1 src/utils/script/script.h
  121. +0 −1 src/utils/script/script_read.cpp
  122. +2 −0 src/utils/script/script_write.h
  123. +8 −1 src/utils/ustring.cpp
  124. +3 −1 src/utils/ustring.h
  125. +2 −1 src/utils/utils_numeric.cpp
  126. +1 −1 src/utils/utils_numeric.h
  127. +2 −1 src/utils/utils_random.cpp
  128. +3 −1 src/utils/utils_random.h
  129. +3 −1 src/utils/utils_strings.cpp
View
@@ -396,33 +396,6 @@ ENDIF ()
SET (PROGRAMS valyriatear)
-# Adds pch compilation support for gcc using cmake
-IF (CMAKE_COMPILER_IS_GNUCXX AND USE_PCH_COMPILATION)
- MACRO (ADD_PCH_RULE _header_filename _src_list)
- SET(_gch_filename "${_header_filename}.gch")
- LIST(APPEND ${_src_list} ${_gch_filename})
- SET (_args ${CMAKE_CXX_FLAGS} ${FLAGS})
-
- IF (CMAKE_BUILD_TYPE_TOLOWER MATCHES release)
- # Adds the release cxx compile flags
- LIST(APPEND _args ${CMAKE_CXX_FLAGS_RELEASE})
- ENDIF()
-
- LIST(APPEND _args -c ${_header_filename} -o ${_gch_filename})
- GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES)
- foreach (_inc ${DIRINC})
- LIST(APPEND _args " -I" ${_inc})
- endforeach(_inc ${DIRINC})
- SEPARATE_ARGUMENTS(_args)
- add_custom_command(OUTPUT ${_gch_filename}
- COMMAND rm -f ${_gch_filename}
- COMMAND ${CMAKE_CXX_COMPILER} ${_args}
- DEPENDS ${_header_filename})
- ENDMACRO(ADD_PCH_RULE _header_filename _src_list)
-
- ADD_PCH_RULE(${CMAKE_CURRENT_SOURCE_DIR}/common/include_pch.h SRCS)
-ENDIF()
-
ADD_EXECUTABLE(valyriatear WIN32 ${SRCS} ${SRCS_COMMON} ${SRCS_LUABIND})
# Vorbis, vorbisfile and ogg are explcitely needed on OpenBSD
View
@@ -15,7 +15,6 @@
*** \brief Source file for common code shared across the source tree
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "common.h"
namespace vt_common {
@@ -24,8 +24,6 @@
*** as necessary to gain an understanding of this code style.
*** **************************************************************************/
-#include "common/include_pch.h"
-
#include "common.h"
#include "dialogue.h"
View
@@ -15,7 +15,6 @@
*** \brief Source file for common dialogue code.
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "dialogue.h"
#include "common/global/global.h"
@@ -14,7 +14,6 @@
*** \author Yohann Ferreira, yohann ferreira orange fr
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "battle_media.h"
#include "engine/system.h"
@@ -15,7 +15,6 @@
*** \brief Source file for the global game manager
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global.h"
#include "engine/system.h"
@@ -15,7 +15,6 @@
*** \brief Source file for global game actors
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global_actors.h"
#include "utils/script/script_read.h"
@@ -15,7 +15,6 @@
*** \brief Source file for global game effects
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global_effects.h"
#include "global.h"
@@ -11,7 +11,8 @@
#ifndef __GLOBAL_EVENT_GROUP_HEADER__
#define __GLOBAL_EVENT_GROUP_HEADER__
-#include "common/include_pch.h"
+#include <string>
+#include <map>
namespace vt_global
{
@@ -15,7 +15,6 @@
*** \brief Source file for global game objects
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global_objects.h"
#include "global.h"
@@ -15,7 +15,6 @@
*** \brief Source file for global game skills.
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global_skills.h"
#include "utils/script/script.h"
@@ -15,7 +15,6 @@
*** \brief Source file for global game utility code
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "global_utils.h"
#include "global.h"
@@ -23,13 +23,16 @@
#include "engine/video/image.h"
+#include <memory>
+#include <map>
+
namespace vt_audio {
class SoundDescriptor;
}
namespace vt_video {
class StillImage;
-};
+}
namespace vt_global
{
View
@@ -16,7 +16,6 @@
***
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "gui.h"
#include "engine/video/video.h"
View
@@ -27,6 +27,8 @@
#include "common/position_2d.h"
+#include <map>
+
namespace vt_video
{
class StillImage;
@@ -15,7 +15,6 @@
*** \brief Header file for menu window class
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "menu_window.h"
#include "engine/video/video.h"
@@ -15,7 +15,6 @@
*** \brief Header file for OptionBox GUI control and supporting classes
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "option.h"
#include "engine/video/gl/gl_vector.h"
@@ -24,6 +23,9 @@
#include "utils/utils_common.h"
#include "utils/utils_strings.h"
+#include <cassert>
+#include <limits>
+
using namespace vt_utils;
using namespace vt_video;
using namespace vt_video::private_video;
@@ -230,10 +232,10 @@ void OptionBox::Draw()
VideoManager->EnableScissoring();
// Transform into clip space.
- vt_video::gl::Vector top_left = vt_video::gl::Vector(left, top, 0.0f, 1.0f);
+ vt_video::gl::Vector4f top_left = vt_video::gl::Vector4f(left, top, 0.0f, 1.0f);
top_left = VideoManager->_projection * top_left;
- vt_video::gl::Vector bottom_right = vt_video::gl::Vector(right, bottom, 0.0f, 1.0f);
+ vt_video::gl::Vector4f bottom_right = vt_video::gl::Vector4f(right, bottom, 0.0f, 1.0f);
bottom_right = VideoManager->_projection * bottom_right;
// Transform into normalized device coordinates.
View
@@ -15,14 +15,15 @@
*** \brief Header file for TextBox class
*** ***************************************************************************/
-#include "common/include_pch.h"
#include "textbox.h"
#include "common/gui/menu_window.h"
#include "engine/video/video.h"
#include "utils/utils_common.h"
+#include <cassert>
+
using namespace vt_utils;
using namespace vt_video;
using namespace vt_video::private_video;
@@ -70,7 +71,6 @@ TextBox::TextBox(float x, float y, float width, float height, const TEXT_DISPLAY
SetPosition(x, y);
}
-
void TextBox::ClearText()
{
_finished = true;
@@ -80,8 +80,6 @@ void TextBox::ClearText()
_text_image.Clear();
}
-
-
void TextBox::Update(uint32_t time)
{
if (_finished)
@@ -93,8 +91,6 @@ void TextBox::Update(uint32_t time)
_finished = true;
}
-
-
void TextBox::Draw()
{
if(_mode != VIDEO_TEXT_INSTANT && _text.empty())
@@ -124,9 +120,7 @@ void TextBox::Draw()
_DEBUG_DrawOutline();
VideoManager->PopState();
-} // void TextBox::Draw()
-
-
+}
void TextBox::SetDimensions(float w, float h)
{
@@ -145,17 +139,13 @@ void TextBox::SetDimensions(float w, float h)
_ReformatText();
}
-
-
void TextBox::SetTextAlignment(int32_t xalign, int32_t yalign)
{
_text_xalign = xalign;
_text_yalign = yalign;
_ReformatText();
}
-
-
void TextBox::SetTextStyle(const TextStyle &style)
{
if(style.GetFontProperties() == nullptr) {
@@ -169,8 +159,6 @@ void TextBox::SetTextStyle(const TextStyle &style)
_ReformatText();
}
-
-
void TextBox::SetDisplayMode(const TEXT_DISPLAY_MODE &mode)
{
if(mode < VIDEO_TEXT_INSTANT || mode >= VIDEO_TEXT_TOTAL) {
@@ -181,8 +169,6 @@ void TextBox::SetDisplayMode(const TEXT_DISPLAY_MODE &mode)
_mode = mode;
}
-
-
void TextBox::SetDisplaySpeed(float display_speed)
{
// Avoid strange behaviours by not permitting under 1.0f.
@@ -195,15 +181,11 @@ void TextBox::SetDisplaySpeed(float display_speed)
_display_speed = display_speed;
}
-
-
void TextBox::SetDisplayText(const std::string &text)
{
SetDisplayText(MakeUnicodeString(text));
}
-
-
void TextBox::SetDisplayText(const ustring &text)
{
// If the text hasn't changed, don't recompute the textbox.
@@ -242,9 +224,7 @@ void TextBox::SetDisplayText(const ustring &text)
break;
};
-} // void TextBox::SetDisplayText(const ustring& text)
-
-
+}
void TextBox::_ReformatText()
{
Oops, something went wrong.

0 comments on commit 3e7355b

Please sign in to comment.