|
@@ -44,11 +44,12 @@ namespace igl
|
|
|
|
|
|
struct ReTwRWItem
|
|
struct ReTwRWItem
|
|
{
|
|
{
|
|
- const char * name;
|
|
|
|
|
|
+ //const char * name;
|
|
|
|
+ std::string name;
|
|
TwType type;
|
|
TwType type;
|
|
void * var;
|
|
void * var;
|
|
ReTwRWItem(
|
|
ReTwRWItem(
|
|
- const char * name,
|
|
|
|
|
|
+ const std::string name,
|
|
TwType type,
|
|
TwType type,
|
|
void *var)
|
|
void *var)
|
|
{
|
|
{
|
|
@@ -60,13 +61,14 @@ namespace igl
|
|
|
|
|
|
struct ReTwCBItem
|
|
struct ReTwCBItem
|
|
{
|
|
{
|
|
- const char * name;
|
|
|
|
|
|
+ //const char * name;
|
|
|
|
+ std::string name;
|
|
TwSetVarCallback setCallback;
|
|
TwSetVarCallback setCallback;
|
|
TwGetVarCallback getCallback;
|
|
TwGetVarCallback getCallback;
|
|
void * clientData;
|
|
void * clientData;
|
|
TwType type;
|
|
TwType type;
|
|
ReTwCBItem(
|
|
ReTwCBItem(
|
|
- const char * name,
|
|
|
|
|
|
+ const std::string name,
|
|
TwType type,
|
|
TwType type,
|
|
TwSetVarCallback setCallback,
|
|
TwSetVarCallback setCallback,
|
|
TwGetVarCallback getCallback,
|
|
TwGetVarCallback getCallback,
|
|
@@ -158,7 +160,7 @@ namespace igl
|
|
// Returns
|
|
// Returns
|
|
// true only if string matched a valid type
|
|
// true only if string matched a valid type
|
|
bool type_from_string(const char *type_str, TwType & type);
|
|
bool type_from_string(const char *type_str, TwType & type);
|
|
- // I realize that I mixing std::string and const char * all over the place.
|
|
|
|
|
|
+ // I realize that I mix std::string and const char * all over the place.
|
|
// What can you do...
|
|
// What can you do...
|
|
bool set_value_from_string(
|
|
bool set_value_from_string(
|
|
const char * name,
|
|
const char * name,
|