Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

Timestamp:

13 Nov 2015, 16:29:39 (9 years ago)

Author:

tech

Message:

Merged 15.1-dev1@1381.

File:

• trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp (modified) (15 diffs)

trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

@@ -37 +37 @@
 #include "TRenModSetupStrParser.h"
 
-#if NH_3D
+#if NH_3D_VSO
 Int
 TRenModSetupStrParser::getNumOfModels()
@@ -153 +153 @@
 
 Void
-TRenModSetupStrParser::setString( Int iNumOfBaseViews, Char* pchSetStr )
+TRenModSetupStrParser::setString( Int iNumOfBaseViews, TChar* pchSetStr )
 {
   for (Int iContent = 0; iContent < 2; iContent++)
@@ -178 +178 @@
 TRenModSetupStrParser::xParseString()
 {
-  Char cChar;
+  TChar cChar;
   xGetNextChar(cChar);
   while(  cChar != '\0' )
@@ -220 +220 @@
   m_bCurrentViewSet = false;
 
-  Char cChar;
+  TChar cChar;
   xGetNextCharGoOn( cChar );
   xError( cChar != '[' );
@@ -249 +249 @@
 
 Void
-TRenModSetupStrParser::xReadViews( Char cType )
-{
-  Char cChar;
+TRenModSetupStrParser::xReadViews( TChar cType )
+{
+  TChar cChar;
   xGetNextCharGoOn( cChar );
   xError( cChar != '(' );
@@ -272 +272 @@
 
 Void
-TRenModSetupStrParser::xReadViewInfo( Char cType )
+TRenModSetupStrParser::xReadViewInfo( TChar cType )
 {
   std::vector<Int> aiViewNums;
@@ -280 +280 @@
   {
   case 'B':
-    Char cVideoType;
-    Char cDepthType;
+    TChar cVideoType;
+    TChar cDepthType;
 
     xGetNextCharGoOn   ( cVideoType );
@@ -317 +317 @@
   case 'L':
   case 'R':
-    Char cRefType;
+    TChar cRefType;
     xGetNextCharGoOn   ( cRefType   );
     xGetViewNumberRange( aiViewNums );
@@ -328 +328 @@
 
 Void
-TRenModSetupStrParser::xAddBaseView( Int iViewIdx, Char cVideoType, Char cDepthType )
+TRenModSetupStrParser::xAddBaseView( Int iViewIdx, TChar cVideoType, TChar cDepthType )
 {
   AOF( m_bCurrentViewSet );
@@ -334 +334 @@
   if ( cDepthType == 'x' ) cDepthType = 'o';
   if ( cVideoType == 'x' ) cVideoType = 'o';
-
-
-
+  
   xError( cDepthType != 'o' && cDepthType != 'c' && cVideoType != 'r' );
   xError( cVideoType != 'o' && cVideoType != 'c' && cVideoType != 'r' );
@@ -346 +344 @@
 
 Void
-TRenModSetupStrParser::xAddSynthView( Int iViewNum, Char cType, Char cRefType )
+TRenModSetupStrParser::xAddSynthView( Int iViewNum, TChar cType, TChar cRefType )
 {
   AOF( m_bCurrentViewSet );
@@ -399 +397 @@
   size_t iStartPos;
   size_t iEndPos;
-  Char cChar;
+  TChar cChar;
   xGetNextCharGoOn(cChar );
   if (cChar == '{')
@@ -424 +422 @@
 
   size_t iNumElem = iEndPos - iStartPos + 1;
-  Char* pcTempBuffer = new Char[  iNumElem + 1];
+  TChar* pcTempBuffer = new TChar[  iNumElem + 1];
   strncpy( pcTempBuffer, m_pchSetStr + iStartPos, iNumElem );
   pcTempBuffer[iNumElem] = '\0';
@@ -433 +431 @@
 
 Void
-TRenModSetupStrParser::xGetNextCharGoOn( Char& rcNextChar )
+TRenModSetupStrParser::xGetNextCharGoOn( TChar& rcNextChar )
 {
   while ( m_pchSetStr[m_iPosInStr] == ' ' || m_pchSetStr[m_iPosInStr] == ',' )
@@ -445 +443 @@
 
 Void
-TRenModSetupStrParser::xGetNextChar( Char& rcNextChar )
+TRenModSetupStrParser::xGetNextChar( TChar& rcNextChar )
 {
   size_t iPos = m_iPosInStr;