Преглед на файлове

Removing the PROPERTY (WIP)

Panagiotis Christopoulos Charitos преди 15 години
родител
ревизия
132d4e92c9
променени са 2 файла, в които са добавени 27 реда и са изтрити 4 реда
  1. 21 0
      docs/manual
  2. 6 4
      src/Util/Tokenizer/Scanner.h

+ 21 - 0
docs/manual

@@ -275,6 +275,27 @@ For Example:
 MeshSkelNodeCtrl A Mesh is controlled by a SkelNode
 MeshSkelNodeCtrl A Mesh is controlled by a SkelNode
 
 
 
 
+GLSL shaders
+------------
+
+The same rules apply to GLSL shaders but with a few changes:
+
+All the vars you can find in a GLSL shader program are either attributes,
+uniforms or in/out vars (varyings) and everything else. The attributes and
+uniforms are mixed case. The in/out vars are mixed case as well but they have a
+prefix string that indicates their output. For example if a var is output from
+the vertex shader it will have a 'v' before its name. The In detail:
+
+v: Vertex shader
+tc: Tessellation control shader
+te: Tessellation evaluation shader
+g: Geometry shader
+f: Fragment shader
+
+All the other variables (locals and globals) inside the code are mixed case but
+with a leading and a following underscore. 
+
+
 Submitting patches
 Submitting patches
 ------------------
 ------------------
 
 

+ 6 - 4
src/Util/Tokenizer/Scanner.h

@@ -105,19 +105,21 @@ class Scanner
 		{
 		{
 			friend class Scanner;
 			friend class Scanner;
 
 
-			PROPERTY_R(TokenCode, code, getCode) ///< The first thing you should know about a token
-			PROPERTY_R(TokenDataType, dataType, getDataType) ///< Additional info in case @ref code is @ref TC_NUMBER
-			PROPERTY_R(TokenDataVal, value, getValue) ///< A value variant
-
 			public:
 			public:
 				Token(): code(TC_ERROR) {}
 				Token(): code(TC_ERROR) {}
 				Token(const Token& b);
 				Token(const Token& b);
 				const char* getString() const {return asString;}
 				const char* getString() const {return asString;}
+				TokenCode getCode() const {return code;}
+				TokenDataType getDataType() const {return dataType;}
+				const TokenDataVal& getValue() const {return value;}
 				string getInfoStr() const; ///< Get a string with the info of the token
 				string getInfoStr() const; ///< Get a string with the info of the token
 				void print() const; ///< Print info of the token
 				void print() const; ///< Print info of the token
 
 
 			private:
 			private:
 				char asString[1024];
 				char asString[1024];
+				TokenCode code; ///< The first thing you should know about a token
+				TokenDataType dataType; ///< Additional info in case @ref code is @ref TC_NUMBER
+				TokenDataVal value; ///< A value variant
 		}; // end class Token
 		}; // end class Token