X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=b882cf1be18f6f5e0b2ede67e831a8eed0ae1cee;hp=d99bb95e24e53a2878143c949f5113fdfca980a5;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7ab13563ec79b45a09f03da73acb15b39e192df9

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index d99bb95e..b882cf1b 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -10,7 +10,7 @@ using namespace std;
 namespace {
 
 template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
 {
 	data.insert(data.end(), sizeof(T), 0);
 	*(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -26,7 +26,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	data.resize(count*sizeof(U));
@@ -35,7 +35,7 @@ void expand(vector<Msp::UInt8> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	for(unsigned i=0; i<count; ++i)
@@ -70,9 +70,9 @@ void Batch::set_index_type(DataType t)
 		throw invalid_operation("Batch::set_data_type");
 
 	if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-		expand<UInt16, UInt32>(data);
+		expand<uint16_t, uint32_t>(data);
 	else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-		shrink<UInt32, UInt16>(data);
+		shrink<uint32_t, uint16_t>(data);
 
 	index_type = t;
 	gl_index_type = get_gl_type(t);
@@ -132,9 +132,9 @@ Batch &Batch::append(const Batch &other)
 	else if(MSP_primitive_restart)
 	{
 		if(index_type==UNSIGNED_INT)
-			::append<UInt32>(data, 0xFFFFFFFF);
+			::append<uint32_t>(data, 0xFFFFFFFF);
 		else
-			::append<UInt16>(data, 0xFFFF);
+			::append<uint16_t>(data, 0xFFFF);
 	}
 	else if(prim_type==TRIANGLE_STRIP)
 	{
@@ -165,22 +165,22 @@ void Batch::append_index(unsigned i)
 		set_index_type(UNSIGNED_INT);
 
 	if(index_type==UNSIGNED_INT)
-		::append<UInt32>(data, i);
+		::append<uint32_t>(data, i);
 	else
-		::append<UInt16>(data, i);
+		::append<uint16_t>(data, i);
 }
 
 unsigned Batch::get_index_size() const
 {
-	return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
+	return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
 }
 
 unsigned Batch::get_index(unsigned i) const
 {
 	if(index_type==UNSIGNED_INT)
-		return *(UInt32 *)&data[i*sizeof(UInt32)];
+		return *(uint32_t *)&data[i*sizeof(uint32_t)];
 	else
-		return *(UInt16 *)&data[i*sizeof(UInt16)];
+		return *(uint16_t *)&data[i*sizeof(uint16_t)];
 }