diff --git a/data/gui/multitouch_settings.stkgui b/data/gui/multitouch_settings.stkgui
index 1cf3857bf..4ea7bd71d 100644
--- a/data/gui/multitouch_settings.stkgui
+++ b/data/gui/multitouch_settings.stkgui
@@ -4,76 +4,75 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index d91ca73f6..6bdfa1ae8 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -926,6 +926,10 @@ namespace UserConfigParams
PARAM_DEFAULT( BoolUserConfigParam(false, "artist_debug_mode",
"Whether to enable track debugging features") );
+ PARAM_PREFIX BoolUserConfigParam m_hide_gui
+ PARAM_DEFAULT(BoolUserConfigParam(false, "debug_hide_gui",
+ "Whether to hide the GUI (artist debug mode)"));
+
PARAM_PREFIX BoolUserConfigParam m_everything_unlocked
PARAM_DEFAULT( BoolUserConfigParam(false, "everything_unlocked",
"Enable all karts and tracks") );
diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp
index f247379b2..76cfc85e4 100644
--- a/src/graphics/rtts.cpp
+++ b/src/graphics/rtts.cpp
@@ -88,6 +88,7 @@ RTT::RTT(size_t width, size_t height)
GLint rgb_format = GL_BGR;
GLint diffuse_specular_internal_format = GL_R11F_G11F_B10F;
GLint type = GL_FLOAT;
+ GLint srgb_internal_format = GL_SRGB8_ALPHA8;
#if defined(USE_GLES2)
if (!CVS->isEXTColorBufferFloatUsable())
@@ -101,6 +102,8 @@ RTT::RTT(size_t width, size_t height)
diffuse_specular_internal_format = GL_RGBA8;
type = GL_UNSIGNED_BYTE;
}
+
+ srgb_internal_format = GL_RGBA8;
#endif
RenderTargetTextures[RTT_TMP1] = generateRTT(res, rgba_internal_format, rgba_format, type);
@@ -110,9 +113,9 @@ RTT::RTT(size_t width, size_t height)
RenderTargetTextures[RTT_LINEAR_DEPTH] = generateRTT(res, red32_internal_format, red_format, type, linear_depth_mip_levels);
RenderTargetTextures[RTT_NORMAL_AND_DEPTH] = generateRTT(res, rgba_internal_format, GL_RGBA, type);
RenderTargetTextures[RTT_COLOR] = generateRTT(res, rgba_internal_format, rgba_format, type);
- RenderTargetTextures[RTT_MLAA_COLORS] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
- RenderTargetTextures[RTT_MLAA_TMP] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
- RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, GL_SRGB8_ALPHA8, rgb_format, GL_UNSIGNED_BYTE);
+ RenderTargetTextures[RTT_MLAA_COLORS] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
+ RenderTargetTextures[RTT_MLAA_TMP] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
+ RenderTargetTextures[RTT_MLAA_BLEND] = generateRTT(res, srgb_internal_format, rgb_format, GL_UNSIGNED_BYTE);
RenderTargetTextures[RTT_SSAO] = generateRTT(res, red_internal_format, red_format, type);
RenderTargetTextures[RTT_DISPLACE] = generateRTT(res, rgba_internal_format, rgba_format, type);
RenderTargetTextures[RTT_DIFFUSE] = generateRTT(res, diffuse_specular_internal_format, rgb_format, type);
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index c9352a9ba..b0cd78b38 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -863,6 +863,10 @@ void ShaderBasedRenderer::render(float dt)
irr_driver->getVideoDriver()->setViewPort(core::recti(0, 0,
irr_driver->getActualScreenSize().Width,
irr_driver->getActualScreenSize().Height));
+
+ m_current_screen_size = core::vector2df(
+ irr_driver->getActualScreenSize().Width,
+ irr_driver->getActualScreenSize().Height);
for(unsigned int i=0; igetActualScreenSize().Height;
+ m_arrows_w = (int)(screen_height / 15);
+ m_arrows_w = std::max(m_arrows_w, 40);
+#ifdef ANDROID
+ m_arrows_w *= 1.5f;
+#endif
+ const int button_h = m_arrows_w;
// right arrow
rect right_arrow_location = rect(m_x + m_w - m_arrows_w,
diff --git a/src/items/item.hpp b/src/items/item.hpp
index 60f66f823..9ed3962d3 100644
--- a/src/items/item.hpp
+++ b/src/items/item.hpp
@@ -30,7 +30,7 @@
#include "utils/no_copy.hpp"
#include "utils/vec3.hpp"
-#include
+#include
class AbstractKart;
class Item;
@@ -194,10 +194,12 @@ public:
*/
bool hitKart(const Vec3 &xyz, const AbstractKart *kart=NULL) const
{
- Vec3 diff = (xyz - m_xyz);
- diff.setY(diff.getY() / 2.0f); // don't be too strict if the kart is a bit above the item
- return (m_event_handler!=kart || m_deactive_time <=0) &&
- diff.length2() 0)
+ return false;
+ Vec3 lc = quatRotate(m_original_rotation, xyz - m_xyz);
+ // Don't be too strict if the kart is a bit above the item
+ lc.setY(lc.getY() / 2.0f);
+ return lc.length2() < m_distance_2;
} // hitKart
protected:
@@ -214,7 +216,7 @@ protected:
const AbstractKart *kart=NULL) const
{
if(m_event_handler==kart && m_deactive_time >0) return false;
-
+
Vec3 closest = line.getClosestPoint(m_xyz.toIrrVector());
return hitKart(closest, kart);
} // hitLine
diff --git a/src/karts/controller/skidding_ai.cpp b/src/karts/controller/skidding_ai.cpp
index 092e3393f..c3ee4fafa 100644
--- a/src/karts/controller/skidding_ai.cpp
+++ b/src/karts/controller/skidding_ai.cpp
@@ -40,6 +40,7 @@
#include "karts/skidding.hpp"
#include "modes/linear_world.hpp"
#include "modes/profile_world.hpp"
+#include "physics/triangle_mesh.hpp"
#include "race/race_manager.hpp"
#include "tracks/drive_graph.hpp"
#include "tracks/track.hpp"
@@ -911,8 +912,15 @@ bool SkiddingAI::steerToAvoid(const std::vector &items_to_avoid,
const Vec3& left = items_to_avoid[index_left_most]->getXYZ();
int node_index = items_to_avoid[index_left_most]->getGraphNode();
const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
+ Vec3 hit;
+ Vec3 hit_nor(0, 1, 0);
+ const Material* m;
+ m_track->getPtrTriangleMesh()->castRay(
+ Vec3(line_to_target.getMiddle()) + normal,
+ Vec3(line_to_target.getMiddle()) + normal * -10000, &hit, &m,
+ &hit_nor);
Vec3 p1 = line_to_target.start,
- p2 = line_to_target.getMiddle() + normal.toIrrVector(),
+ p2 = line_to_target.getMiddle() + hit_nor.toIrrVector(),
p3 = line_to_target.end;
int item_index = -1;
@@ -929,12 +937,6 @@ bool SkiddingAI::steerToAvoid(const std::vector &items_to_avoid,
else
{
const Vec3& right = items_to_avoid[index_right_most]->getXYZ();
- int node_index = items_to_avoid[index_right_most]->getGraphNode();
- const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
- Vec3 p1 = line_to_target.start,
- p2 = line_to_target.getMiddle() + normal.toIrrVector(),
- p3 = line_to_target.end;
-
if (right.sideofPlane(p1, p2, p3) >= 0)
{
// Right of rightmost point
diff --git a/src/karts/controller/skidding_ai.hpp b/src/karts/controller/skidding_ai.hpp
index 68c0bc050..1eff42935 100644
--- a/src/karts/controller/skidding_ai.hpp
+++ b/src/karts/controller/skidding_ai.hpp
@@ -48,6 +48,8 @@
#include "tracks/drive_node.hpp"
#include "utils/random_generator.hpp"
+#include
+
class LinearWorld;
class DriveGraph;
class ShowCurve;
diff --git a/src/karts/controller/test_ai.cpp b/src/karts/controller/test_ai.cpp
index 915b18772..95313d8a8 100644
--- a/src/karts/controller/test_ai.cpp
+++ b/src/karts/controller/test_ai.cpp
@@ -40,6 +40,7 @@
#include "karts/skidding.hpp"
#include "modes/linear_world.hpp"
#include "modes/profile_world.hpp"
+#include "physics/triangle_mesh.hpp"
#include "race/race_manager.hpp"
#include "tracks/drive_graph.hpp"
#include "tracks/track.hpp"
@@ -917,8 +918,15 @@ bool SkiddingAI::steerToAvoid(const std::vector &items_to_avoid,
const Vec3& left = items_to_avoid[index_left_most]->getXYZ();
int node_index = items_to_avoid[index_left_most]->getGraphNode();
const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
+ Vec3 hit;
+ Vec3 hit_nor(0, 1, 0);
+ const Material* m;
+ m_track->getPtrTriangleMesh()->castRay(
+ Vec3(line_to_target.getMiddle()) + normal,
+ Vec3(line_to_target.getMiddle()) + normal * -10000, &hit, &m,
+ &hit_nor);
Vec3 p1 = line_to_target.start,
- p2 = line_to_target.getMiddle() + normal.toIrrVector(),
+ p2 = line_to_target.getMiddle() + hit_nor.toIrrVector(),
p3 = line_to_target.end;
int item_index = -1;
@@ -935,12 +943,6 @@ bool SkiddingAI::steerToAvoid(const std::vector &items_to_avoid,
else
{
const Vec3& right = items_to_avoid[index_right_most]->getXYZ();
- int node_index = items_to_avoid[index_right_most]->getGraphNode();
- const Vec3& normal = DriveGraph::get()->getNode(node_index)->getNormal();
- Vec3 p1 = line_to_target.start,
- p2 = line_to_target.getMiddle() + normal.toIrrVector(),
- p3 = line_to_target.end;
-
if (right.sideofPlane(p1, p2, p3) >= 0)
{
// Right of rightmost point
diff --git a/src/karts/controller/test_ai.hpp b/src/karts/controller/test_ai.hpp
index 97f6d90da..61d10d14e 100644
--- a/src/karts/controller/test_ai.hpp
+++ b/src/karts/controller/test_ai.hpp
@@ -49,6 +49,8 @@
#include "tracks/drive_node.hpp"
#include "utils/random_generator.hpp"
+#include
+
#ifdef AI_DEBUG
class ShowCurve;
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index 43f54ae84..dc5ae15c7 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -2557,7 +2557,16 @@ void Kart::loadData(RaceManager::KartType type, bool is_animated_model)
->isFogEnabled() );
}
#ifndef SERVER_ONLY
- if (!CVS->supportsShadows())
+ bool create_shadow = m_kart_properties->getShadowTexture() != NULL &&
+ !CVS->supportsShadows();
+
+#ifdef USE_GLES2
+ // Disable kart shadow for legacy pipeline in GLES renderer because it's
+ // broken
+ create_shadow = create_shadow && CVS->isGLSL();
+#endif
+
+ if (create_shadow)
{
m_shadow = new Shadow(m_kart_properties.get(), m_node,
-m_kart_model->getLowestPoint());
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 0fb540275..7ee8e0715 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -65,6 +65,9 @@ RaceGUI::RaceGUI()
{
m_enabled = true;
+ if (UserConfigParams::m_artist_debug_mode && UserConfigParams::m_hide_gui)
+ m_enabled = false;
+
// Determine maximum length of the rank/lap text, in order to
// align those texts properly on the right side of the viewport.
gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
diff --git a/src/states_screens/race_gui_multitouch.cpp b/src/states_screens/race_gui_multitouch.cpp
index c2ef0a777..db027b284 100644
--- a/src/states_screens/race_gui_multitouch.cpp
+++ b/src/states_screens/race_gui_multitouch.cpp
@@ -41,6 +41,7 @@ RaceGUIMultitouch::RaceGUIMultitouch(RaceGUIBase* race_gui)
{
m_race_gui = race_gui;
m_minimap_bottom = 0;
+ m_gui_action = false;
m_directionnal_wheel_tex = NULL;
m_pause_tex = NULL;
m_nitro_tex = NULL;
@@ -147,6 +148,7 @@ void RaceGUIMultitouch::initMultitouchSteering()
"android/blur_bg_button.png");
m_bg_button_focus_tex = irr_driver->getTexture(FileManager::GUI,
"android/blur_bg_button_focus.png");
+ m_gui_action_tex = irr_driver->getTexture(FileManager::GUI,"challenge.png");
} // initMultitouchSteering
@@ -209,8 +211,12 @@ void RaceGUIMultitouch::drawMultitouchSteering(const AbstractKart* kart,
case MultitouchButtonType::BUTTON_FIRE:
{
const Powerup* powerup = kart->getPowerup();
- if (powerup->getType() != PowerupManager::POWERUP_NOTHING &&
- !kart->hasFinishedRace())
+ if (m_gui_action == true)
+ {
+ btn_texture = m_gui_action_tex;
+ }
+ else if (powerup->getType() != PowerupManager::POWERUP_NOTHING
+ && !kart->hasFinishedRace())
{
btn_texture = powerup->getIcon()->getTexture();
}
@@ -271,7 +277,8 @@ void RaceGUIMultitouch::drawMultitouchSteering(const AbstractKart* kart,
core::vector2df(scale, scale));
}
else if (button->type == MultitouchButtonType::BUTTON_FIRE &&
- kart->getPowerup()->getNum() > 1)
+ kart->getPowerup()->getNum() > 1 &&
+ m_gui_action == false)
{
gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
core::rect pos((int)(button->x),
diff --git a/src/states_screens/race_gui_multitouch.hpp b/src/states_screens/race_gui_multitouch.hpp
index 71b003fc4..876551a94 100644
--- a/src/states_screens/race_gui_multitouch.hpp
+++ b/src/states_screens/race_gui_multitouch.hpp
@@ -35,6 +35,7 @@ private:
RaceGUIBase* m_race_gui;
MultitouchDevice* m_device;
+ bool m_gui_action;
unsigned int m_minimap_bottom;
video::ITexture* m_directionnal_wheel_tex;
@@ -46,6 +47,7 @@ private:
video::ITexture* m_drift_tex;
video::ITexture* m_bg_button_tex;
video::ITexture* m_bg_button_focus_tex;
+ video::ITexture* m_gui_action_tex;
void initMultitouchSteering();
void closeMultitouchSteering();
@@ -59,6 +61,7 @@ public:
const core::vector2df &scaling);
unsigned int getMinimapBottom() {return m_minimap_bottom;}
+ void setGuiAction(bool enabled = true) {m_gui_action = enabled;}
}; // RaceGUIMultitouch
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index fe476df34..bff708a30 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -73,6 +73,10 @@ const int COMPLETED_HARD = 4;
RaceGUIOverworld::RaceGUIOverworld()
{
m_enabled = true;
+
+ if (UserConfigParams::m_artist_debug_mode && UserConfigParams::m_hide_gui)
+ m_enabled = false;
+
m_is_first_render_call = true;
m_close_to_a_challenge = false;
m_current_challenge = NULL;
@@ -586,6 +590,11 @@ void RaceGUIOverworld::drawGlobalMiniMap()
true, true /* vcenter */, NULL);
}
}
+
+ if (m_multitouch_gui != NULL)
+ {
+ m_multitouch_gui->setGuiAction(m_close_to_a_challenge);
+ }
#endif // SERVER_ONLY
} // drawGlobalMiniMap
diff --git a/src/tracks/arena_node.hpp b/src/tracks/arena_node.hpp
index c62d55520..0d696eeca 100644
--- a/src/tracks/arena_node.hpp
+++ b/src/tracks/arena_node.hpp
@@ -22,6 +22,7 @@
#include "tracks/quad.hpp"
#include "utils/cpp2011.hpp"
+#include
#include
/**
diff --git a/src/tracks/drive_node.cpp b/src/tracks/drive_node.cpp
index 57d7749cf..a3b6b624a 100644
--- a/src/tracks/drive_node.cpp
+++ b/src/tracks/drive_node.cpp
@@ -20,7 +20,6 @@
#include "io/file_manager.hpp"
#include "io/xml_node.hpp"
-#include "matrix4.h"
#include "tracks/drive_graph.hpp"
#include "utils/log.hpp"
diff --git a/src/tracks/drive_node_3d.hpp b/src/tracks/drive_node_3d.hpp
index 162498a10..07f77947f 100644
--- a/src/tracks/drive_node_3d.hpp
+++ b/src/tracks/drive_node_3d.hpp
@@ -23,6 +23,8 @@
#include "tracks/drive_node.hpp"
#include "utils/cpp2011.hpp"
+#include
+
/**
* \ingroup tracks
*/
diff --git a/src/utils/vec3.hpp b/src/utils/vec3.hpp
index ee60a2a20..78057a08c 100644
--- a/src/utils/vec3.hpp
+++ b/src/utils/vec3.hpp
@@ -20,7 +20,6 @@
#ifndef HEADER_VEC3_HPP
#define HEADER_VEC3_HPP
-#include
#include
#include
using namespace irr;
@@ -216,12 +215,8 @@ public:
float sideofPlane(const Vec3& x1, const Vec3& x2, const Vec3& x3) const
{
- core::triangle3df triangle(x1.toIrrVector(), x2.toIrrVector(), x3.toIrrVector());
- core::vector3df normal = triangle.getNormal();
- return normal.dotProduct((*this - x1).toIrrVector());
-
+ return ((x2 - x1).cross(x3 - x1)).dot(*this - x1);
} // sideOfPlane
}; // Vec3
-
#endif