Fixes for warnings under VisualStudio
This commit is contained in:
parent
7504312839
commit
5830c60cef
@ -5,8 +5,8 @@
|
||||
#ifndef OSG_COLORMATRIX
|
||||
#define OSG_COLORMATRIX 1
|
||||
|
||||
#include <osg/StateAttribute>
|
||||
#include <osg/Matrix>
|
||||
#include <osg/StateAttribute>
|
||||
|
||||
namespace osg {
|
||||
|
||||
|
@ -5,6 +5,7 @@
|
||||
#ifndef OSG_STATEATTRIBUTE
|
||||
#define OSG_STATEATTRIBUTE 1
|
||||
|
||||
#include <osg/Export>
|
||||
#include <osg/Object>
|
||||
#include <osg/GL>
|
||||
|
||||
|
@ -1,3 +1,8 @@
|
||||
#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
|
||||
// disable the double to float errors.
|
||||
#pragma warning( disable : 4305 )
|
||||
#endif
|
||||
|
||||
static float vertex[][3] = {
|
||||
|
||||
{ 5998.7998, 41456.1016, 1.7800 },
|
||||
|
@ -1,3 +1,7 @@
|
||||
#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
|
||||
// disable the double to float errors.
|
||||
#pragma warning( disable : 4305 )
|
||||
#endif
|
||||
|
||||
static float normal[][3] = {
|
||||
{ -0.2560, -0.1125, 0.9600 },
|
||||
|
@ -1,3 +1,8 @@
|
||||
#if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__))
|
||||
// disable the double to float errors.
|
||||
#pragma warning( disable : 4305 )
|
||||
#endif
|
||||
|
||||
static float texcoord[][2] = {
|
||||
#ifdef _ORIGINAL_ /* [ */
|
||||
{ 0.1121, 0.0171 },
|
||||
|
Loading…
Reference in New Issue
Block a user