public OpenGLRenderable
{
AABB m_aabb_local;
-CopiedString m_shader;
+std::string m_shader;
Shader* m_state;
Array<ArbitraryMeshVertex> m_vertices;
};
-typedef std::pair<CopiedString, int> PicoModelKey;
+typedef std::pair<std::string, int> PicoModelKey;
class PicoModel :
class Remap
{
public:
-CopiedString first;
+std::string first;
Shader* second;
Remap() : second( 0 ){
}
if ( !hasName && ( *ptr == ':' || *ptr == '\0' ) ) {
// model name
hasName = true;
- m_name = CopiedString( s, ptr );
+ m_name = std::string( s, ptr );
s = ptr + 1;
}
else if ( *ptr == '?' || *ptr == '\0' ) {
// model frame
hasFrame = true;
- m_frame = atoi( CopiedString( s, ptr ).c_str() );
+ m_frame = atoi( std::string( s, ptr ).c_str() );
s = ptr + 1;
}
else if ( *ptr == '&' || *ptr == '\0' ) {
// a remap
- add_remap( CopiedString( s, ptr ).c_str() );
+ add_remap( std::string( s, ptr ).c_str() );
s = ptr + 1;
}
return "";
}
-CopiedString m_name;
+std::string m_name;
int m_frame;
PicoModel* m_model;
typedef std::vector<remap_t*> remaps_t;
remaps_t m_remaps;
-typedef std::vector<CopiedString> shaders_t;
+typedef std::vector<std::string> shaders_t;
shaders_t m_shaders;
typedef std::vector<Shader*> states_t;
states_t m_states;