1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-25 11:52:40 +01:00

rwengine+tests: disable C4305 warning for bullet3

warning C4305: 'argument': truncation from 'double' to 'const btScalar'
This commit is contained in:
Anonymous Maarten 2018-08-30 17:37:27 +02:00
parent 7bea25e487
commit 32d3ab7508
17 changed files with 118 additions and 3 deletions

View File

@ -4,8 +4,15 @@
#include <limits>
#include <utility>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletDynamics/Character/btKinematicCharacterController.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtc/constants.hpp>
#include <glm/gtc/quaternion.hpp>

View File

@ -4,7 +4,14 @@
#include <cstddef>
#include <limits>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>

View File

@ -1,7 +1,13 @@
#ifndef _RWENGINE_RAYCASTCALLBACKS_HPP_
#define _RWENGINE_RAYCASTCALLBACKS_HPP_
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
/**
* Implements raycast callback that ignores a specified btCollisionObject

View File

@ -1,7 +1,13 @@
#include "engine/GameWorld.hpp"
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtx/norm.hpp>

View File

@ -9,7 +9,14 @@
#include <string>
#include <vector>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <LinearMath/btScalar.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>

View File

@ -1,6 +1,13 @@
#include "Garage.hpp"
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtx/quaternion.hpp>
#include "dynamics/CollisionInstance.hpp"

View File

@ -5,9 +5,15 @@
#include <cstdlib>
#include <memory>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <BulletDynamics/Character/btKinematicCharacterController.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <rw/debug.hpp>

View File

@ -3,8 +3,14 @@
#include <cstdint>
#include <string>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#include <glm/gtc/quaternion.hpp>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <rw/types.hpp>

View File

@ -2,8 +2,15 @@
#include <cmath>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtc/quaternion.hpp>
#include "ai/PlayerController.hpp"
@ -402,9 +409,11 @@ bool CollectablePickup::onPlayerTouch() {
auto text = ScreenText::format(
engine->data->texts.text(gxtEntry),
GameStringUtil::fromString(
std::to_string(state->playerInfo.hiddenPackagesCollected), FONT_PRICEDOWN),
std::to_string(state->playerInfo.hiddenPackagesCollected),
FONT_PRICEDOWN),
GameStringUtil::fromString(
std::to_string(state->playerInfo.hiddenPackageCount), FONT_PRICEDOWN));
std::to_string(state->playerInfo.hiddenPackageCount),
FONT_PRICEDOWN));
state->text.addText<ScreenTextType::HiddenPackageText>(
ScreenTextEntry::makeHiddenPackageText(gxtEntry, text));

View File

@ -1,7 +1,14 @@
#include "objects/ProjectileObject.hpp"
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtc/quaternion.hpp>
#include "data/WeaponData.hpp"

View File

@ -5,8 +5,15 @@
#include <cstdlib>
#include <limits>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletDynamics/Vehicle/btRaycastVehicle.h>
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/gtx/quaternion.hpp>
#include <data/Clump.hpp>

View File

@ -7,7 +7,15 @@
#include <string>
#include <unordered_map>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#include <LinearMath/btScalar.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
@ -15,7 +23,6 @@
#include <objects/GameObject.hpp>
#include <objects/VehicleInfo.hpp>
#include <btBulletDynamicsCommon.h>
class Atomic;
class CharacterObject;

View File

@ -3,7 +3,14 @@
#include <iostream>
#include <glm/glm.hpp>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <LinearMath/btVector3.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <data/Clump.hpp>
#include <gl/DrawBuffer.hpp>

View File

@ -4,8 +4,14 @@
#include <cstddef>
#include <vector>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <LinearMath/btIDebugDraw.h>
#include <LinearMath/btScalar.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <data/Clump.hpp>
#include <gl/gl_core_3_3.h>

View File

@ -3,8 +3,14 @@
#include <chrono>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
// FIXME: should be in rwengine, deeply hidden
#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <engine/GameData.hpp>
#include <engine/GameState.hpp>

View File

@ -21,7 +21,14 @@
#include <glm/gtx/matrix_major_storage.hpp>
#include <glm/gtx/norm.hpp>
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <BulletCollision/CollisionDispatch/btGhostObject.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
constexpr float kAutoLookTime = 2.f;
constexpr float kAutolookMinVelocity = 0.2f;

View File

@ -1,7 +1,14 @@
#ifndef _TESTGLOBALS_HPP_
#define _TESTGLOBALS_HPP_
#ifdef _MSC_VER
#pragma warning(disable : 4305)
#endif
#include <btBulletDynamicsCommon.h>
#ifdef _MSC_VER
#pragma warning(default : 4305)
#endif
#include <SDL.h>
#include <GameWindow.hpp>
#include <boost/test/unit_test.hpp>