matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support floats in the console

Browse Source 
There are some strange bugs with parsing like !set type all 3.5 or !set temp all moo but they aren't too important ...
This commit is contained in:
jacob1 2014-08-06 12:18:57 -04:00
parent 859fdece6a
commit ccb3de7365
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lua/TPTSTypes.cpp
View File

@ -86,12 +86,12 @@ AnyType::~AnyType()
//Number Type //Number Type
NumberType::NumberType(int number): AnyType(TypeNumber, ValueValue()) NumberType::NumberType(float number): AnyType(TypeNumber, ValueValue())
{ {
value.num = number; value.num = number;
} }
int NumberType::Value() float NumberType::Value()
{ {
return value.num; return value.num;
} }

6
src/lua/TPTSTypes.h
View File

@ -6,7 +6,7 @@
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
enum ValueType { TypeNumber, TypePoint, TypeString, TypeNull, TypeFunction }; enum ValueType { TypeNumber, TypePoint, TypeString, TypeNull, TypeFunction };
typedef union { int num; std::string* str; ui::Point* pt; } ValueValue; typedef union { float num; std::string* str; ui::Point* pt; } ValueValue;
class GeneralException class GeneralException
{ {
@ -91,8 +91,8 @@ public:
class NumberType: public AnyType class NumberType: public AnyType
{ {
public: public:
NumberType(int number); NumberType(float number);
int Value(); float Value();
}; };
class StringType: public AnyType class StringType: public AnyType

8
src/lua/TPTScriptInterface.cpp
View File

@ -117,7 +117,7 @@ ValueType TPTScriptInterface::testType(std::string word)
return TypeString; return TypeString;
} }
int TPTScriptInterface::parseNumber(char * stringData) float TPTScriptInterface::parseNumber(char * stringData)
{ {
char cc; char cc;
int base = 10; int base = 10;
@ -257,7 +257,7 @@ AnyType TPTScriptInterface::tptS_set(std::deque<std::string> * words)
throw GeneralException("Invalid property"); throw GeneralException("Invalid property");
//Selector //Selector
int newValue; float newValue;
if(value.GetType() == TypeNumber) if(value.GetType() == TypeNumber)
{ {
newValue = ((NumberType)value).Value(); newValue = ((NumberType)value).Value();
@ -268,9 +268,9 @@ AnyType TPTScriptInterface::tptS_set(std::deque<std::string> * words)
{ {
std::string newString = ((StringType)value).Value(); std::string newString = ((StringType)value).Value();
if (newString.at(newString.length()-1) == 'C') if (newString.at(newString.length()-1) == 'C')
newValue = atoi(newString.substr(0, newString.length()-1).c_str())+273; newValue = atof(newString.substr(0, newString.length()-1).c_str())+273.15;
else if (newString.at(newString.length()-1) == 'F') else if (newString.at(newString.length()-1) == 'F')
newValue = (int)((atoi(newString.substr(0, newString.length()-1).c_str())-32.0f)*5/9+273.15f); newValue = (atof(newString.substr(0, newString.length()-1).c_str())-32.0f)*5/9+273.15f;
} }
else else
{ {

2
src/lua/TPTScriptInterface.h
View File

@ -7,7 +7,7 @@
class TPTScriptInterface: public CommandInterface { class TPTScriptInterface: public CommandInterface {
protected: protected:
AnyType eval(std::deque<std::string> * words); AnyType eval(std::deque<std::string> * words);
int parseNumber(char * stringData); float parseNumber(char * stringData);
AnyType tptS_set(std::deque<std::string> * words); AnyType tptS_set(std::deque<std::string> * words);
AnyType tptS_create(std::deque<std::string> * words); AnyType tptS_create(std::deque<std::string> * words);
AnyType tptS_delete(std::deque<std::string> * words); AnyType tptS_delete(std::deque<std::string> * words);