X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Frpn.qc;h=223d3264d35fba3bd6cbf9b9ee901e71a7fc3a98;hp=5cca2db1ce666145fb7f339925daacaf3ce8f756;hb=ef3193f7a8b94d570b83a09e5f75ba2c87fe2bb9;hpb=e14bb786305e05541496fb5b28c090e0ff1b5783

diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc
index 5cca2db1c..223d3264d 100644
--- a/qcsrc/common/command/rpn.qc
+++ b/qcsrc/common/command/rpn.qc
@@ -3,7 +3,7 @@
 //  Last updated: December 28th, 2011
 // ========================================
 
-string rpn_pop() 
+string rpn_pop()
 {
 	if(rpn_sp > 0) {
 		--rpn_sp;
@@ -14,7 +14,7 @@ string rpn_pop()
 		return "";
 	}
 }
-void rpn_push(string s) 
+void rpn_push(string s)
 {
 	if(rpn_sp < MAX_RPN_STACK) {
 		rpn_stack[rpn_sp] = s;
@@ -24,7 +24,7 @@ void rpn_push(string s)
 		rpn_error = TRUE;
 	}
 }
-string rpn_get() 
+string rpn_get()
 {
 	if(rpn_sp > 0) {
 		return rpn_stack[rpn_sp - 1];
@@ -34,7 +34,7 @@ string rpn_get()
 		return "";
 	}
 }
-void rpn_set(string s) 
+void rpn_set(string s)
 {
 	if(rpn_sp > 0) {
 		rpn_stack[rpn_sp - 1] = s;
@@ -46,8 +46,8 @@ void rpn_set(string s)
 
 float rpn_getf() { return stof(rpn_get()); }
 float rpn_popf() { return stof(rpn_pop()); }
-void rpn_pushf(float f) { return rpn_push(ftos(f)); }
-void rpn_setf(float f) { return rpn_set(ftos(f)); }
+void rpn_pushf(float f) { return rpn_push(sprintf("%.9g", f)); }
+void rpn_setf(float f) { return rpn_set(sprintf("%.9g", f)); }
 
 void GenericCommand_rpn(float request, float argc, string command)
 {
@@ -58,14 +58,14 @@ void GenericCommand_rpn(float request, float argc, string command)
 			float i, j, f, f2, f3, rpnpos;
 			//vector rgb;
 			string s, s2, rpncmd;
-			
+
 			if(!rpn_db)
 			{
 				rpn_db = db_create();
 				db_put(rpn_db, "stack.pointer", "0");
 				db_put(rpn_db, "stack.pos", "-1");
 			}
-			
+
 			if(argc >= 2)
 			{
 				rpn_sp = 0;
@@ -158,6 +158,31 @@ void GenericCommand_rpn(float request, float argc, string command)
 						f = rpn_popf();
 						f2 = rpn_getf();
 						rpn_setf(f2 - f * floor(f2 / f));
+					} else if(rpncmd == "pow" || rpncmd == "**") {
+						f = rpn_popf();
+						rpn_setf(pow(rpn_getf(), f));
+					} else if(rpncmd == "bitand" || rpncmd == "&") {
+						f = rpn_popf();
+						rpn_setf(rpn_getf() & f);
+					} else if(rpncmd == "bitor" || rpncmd == "|") {
+						f = rpn_popf();
+						rpn_setf(rpn_getf() | f);
+					} else if(rpncmd == "bitxor" || rpncmd == "^") {
+						f = rpn_popf();
+						rpn_setf(rpn_getf() ^ f);
+					} else if(rpncmd == "and" || rpncmd == "&&") {
+						f = rpn_popf();
+						rpn_setf(rpn_getf() && f);
+					} else if(rpncmd == "or" || rpncmd == "||") {
+						f = rpn_popf();
+						rpn_setf(rpn_getf() || f);
+					} else if(rpncmd == "xor" || rpncmd == "^^") {
+						f = rpn_popf();
+						rpn_setf(!rpn_getf() != !f);
+					} else if(rpncmd == "bitnot") {
+						rpn_setf(~rpn_popf());
+					} else if(rpncmd == "not") {
+						rpn_setf(!rpn_popf());
 					} else if(rpncmd == "abs") {
 						rpn_setf(fabs(rpn_getf()));
 					} else if(rpncmd == "sgn") {
@@ -174,6 +199,14 @@ void GenericCommand_rpn(float request, float argc, string command)
 						rpn_setf(floor(rpn_getf()));
 					} else if(rpncmd == "ceil" || rpncmd == "c") {
 						rpn_setf(ceil(rpn_getf()));
+					} else if(rpncmd == "exp") {
+						rpn_setf(exp(rpn_getf()));
+					} else if(rpncmd == "log") {
+						rpn_setf(exp(rpn_getf()));
+					} else if(rpncmd == "sin") {
+						rpn_setf(sin(rpn_getf()));
+					} else if(rpncmd == "cos") {
+						rpn_setf(cos(rpn_getf()));
 					} else if(rpncmd == "max") {
 						f = rpn_popf();
 						f2 = rpn_getf();
@@ -189,12 +222,12 @@ void GenericCommand_rpn(float request, float argc, string command)
 						rpn_setf(bound(f3, f2, f));
 					} else if(rpncmd == "when") {
 						f = rpn_popf();
-						f2 = rpn_popf();
-						f3 = rpn_getf();
+						s = rpn_pop();
+						s2 = rpn_get();
 						if(f)
-							rpn_setf(f3);
+							rpn_set(s2);
 						else
-							rpn_setf(f2);
+							rpn_set(s);
 					} else if(rpncmd == ">" || rpncmd == "gt") {
 						f = rpn_popf();
 						rpn_setf(rpn_getf() > f);
@@ -254,7 +287,7 @@ void GenericCommand_rpn(float request, float argc, string command)
 							print("rpn: database underflow\n");
 						}
 					} else if(rpncmd == "dbget") {
-						
+
 						i = stof(db_get(rpn_db, "stack.pointer"));
 						if(i)
 						{
@@ -288,13 +321,13 @@ void GenericCommand_rpn(float request, float argc, string command)
 						{
 							j = stof(db_get(rpn_db, "stack.pointer"));
 							i = stof(db_get(rpn_db, "stack.pos"));
-							
+
 							if(i < 0)
 							{
 								i = 0;
 								db_put(rpn_db, "stack.pos", "0");
 							}
-							
+
 							db_put(rpn_db, "stack.pointer", ftos(j+1));
 							for(--j; j >= i; --j)
 							{
@@ -371,7 +404,7 @@ void GenericCommand_rpn(float request, float argc, string command)
 								i = 0;
 							else
 								i = stof(s);
-							
+
 							j = stof(db_get(rpn_db, "stack.pointer"));
 							if(i < 0 || i >= j)
 							{
@@ -393,7 +426,7 @@ void GenericCommand_rpn(float request, float argc, string command)
 						// tokens f..f2 represent s2
 						// UNION: add all tokens to s that are in s2 but not in s
 						s = "";
-						for(i = 0; i < f; ++i)	
+						for(i = 0; i < f; ++i)
 							s = strcat(s, " ", argv(i));
 						for(i = f; i < f2; ++i) {
 							for(j = 0; j < f; ++j)
@@ -502,6 +535,11 @@ void GenericCommand_rpn(float request, float argc, string command)
 					} else if(rpncmd == "sprintf1s") {
 						s = rpn_pop();
 						rpn_set(sprintf(s, rpn_get()));
+					} else if(rpncmd == "eval") {
+						s = rpn_pop();
+						command = strcat(s, substring(command, argv_end_index(rpnpos), -1));
+						argc = tokenize_console(command);
+						rpnpos = -1;
 					} else {
 						rpn_push(cvar_string(rpncmd));
 					}
@@ -517,7 +555,7 @@ void GenericCommand_rpn(float request, float argc, string command)
 
 			return;
 		}
-			
+
 		default:
 		case CMD_REQUEST_USAGE:
 		{
@@ -528,9 +566,12 @@ void GenericCommand_rpn(float request, float argc, string command)
 			print("    x x exch --------------------------> x x : swap the top two\n");
 			print("    /cvarname load --------------------> x   : loads a cvar\n");
 			print("    /cvarname x def ------------------->     : writes to a cvar\n");
-			print("    f f add|sub|mul|div|mod|max|min ---> f   : adds/... two numbers\n");
-			print("    f f eq|ne|gt|ge|lt|le -------------> f   : compares two numbers\n");
+			print("    f f add|sub|mul|div|mod|pow -------> f   : adds/... two numbers\n");
+			print("    f f and|or|xor|bitand|bitor|bitxor > f   : logical and bitwise operations\n");
+			print("    f f eq|ne|gt|ge|lt|le|max|min -----> f   : compares two numbers\n");
 			print("    f neg|abs|sgn|rand|floor|ceil------> f   : negates/... a number\n");
+			print("    f not|bitnot ----------------------> f   : logical and bitwise negation\n");
+			print("    f exp|log|sin|cos -----------------> f   : exponential function & Co.\n");
 			print("    f f f bound -----------------------> f   : bounds the middle number\n");
 			print("    f1 f2 b when ----------------------> f   : f1 if b, f2 otherwise\n");
 			print("    s s union|intersection|difference -> s   : set operations\n");
@@ -551,6 +592,7 @@ void GenericCommand_rpn(float request, float argc, string command)
 			print("    s /MD4 digest ---------------------> s   : MD4 digest\n");
 			print("    s /SHA256 digest ------------------> s   : SHA256 digest\n");
 			print("    s /formatstring sprintf1s ---------> s   : sprintf with 1 string (pad, cut)\n");
+			print("    s eval ---------------------------->     : does something eval\n");
 			print("    Set operations operate on 'such''strings'.\n");
 			print("    Unknown tokens insert their cvar value.\n");
 			return;