Added missing includes (color and assert)
Added texture name members
This commit is contained in:
parent
213fe182d5
commit
896703158a
|
@ -24,6 +24,9 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.16 2005/11/15 12:09:17 rita_borgo
|
||||||
|
Changed Volume Routine, before was returning negative values
|
||||||
|
|
||||||
Revision 1.15 2005/10/03 16:00:08 rita_borgo
|
Revision 1.15 2005/10/03 16:00:08 rita_borgo
|
||||||
Minor changes
|
Minor changes
|
||||||
|
|
||||||
|
@ -74,7 +77,9 @@ Initial commit
|
||||||
#ifndef __GNUC
|
#ifndef __GNUC
|
||||||
#pragma warning( disable : 4804 )
|
#pragma warning( disable : 4804 )
|
||||||
#endif
|
#endif
|
||||||
|
#include <assert.h>
|
||||||
#include <vcg/space/box3.h>
|
#include <vcg/space/box3.h>
|
||||||
|
#include <vcg/space/color4.h>
|
||||||
#include <vcg/math/shot.h>
|
#include <vcg/math/shot.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -126,8 +131,10 @@ class TriMesh{
|
||||||
Box3<ScalarType> bbox;
|
Box3<ScalarType> bbox;
|
||||||
|
|
||||||
/// Nomi di textures
|
/// Nomi di textures
|
||||||
//vector<string> textures;
|
//
|
||||||
//vector<string> normalmaps;
|
std::vector<std::string> textures;
|
||||||
|
//
|
||||||
|
std::vector<std::string> normalmaps;
|
||||||
|
|
||||||
/// La camera
|
/// La camera
|
||||||
Camera<ScalarType> camera; // intrinsic
|
Camera<ScalarType> camera; // intrinsic
|
||||||
|
|
Loading…
Reference in New Issue