Merge commit 'b7e5662d0c9342cc42501de697386ef5a96277e6' into master-merge

[xonotic/netradiant.git] / radiant / shaders.cpp

diff --git a/radiant/shaders.cpp b/radiant/shaders.cpp
index aec784adebadc81522c02d80538d1a2fff87a50d..f02474e0686f7e3ff13b7e4316396d6f7655f6e9 100644 (file)
--- a/radiant/shaders.cpp
+++ b/radiant/shaders.cpp
@@ -27,45 +27,101 @@
 
 #include "gtkdlgs.h"
 
-void ViewShader(const char *pFile, const char *pName)
-{
-    char *pBuff = 0;
-    //int nSize =
-    vfsLoadFile(pFile, reinterpret_cast<void **>( &pBuff ));
-    if (pBuff == 0) {
-        globalErrorStream() << "Failed to load shader file " << pFile << "\n";
-        return;
-    }
-    // look for the shader declaration
-    StringOutputStream strFind(string_length(pName));
-    strFind << LowerCase(pName);
-    StringOutputStream strLook(string_length(pBuff));
-    strFind << LowerCase(pBuff);
-    // offset used when jumping over commented out definitions
-    std::size_t nOffset = 0;
-    while (true) {
-        const char *substr = strstr(strFind.c_str() + nOffset, strFind.c_str());
-        if (substr == 0) {
-            break;
-        }
-        std::size_t nStart = substr - strLook.c_str();
-        // we have found something, maybe it's a commented out shader name?
-        char *strCheck = new char[string_length(strLook.c_str()) + 1];
-        strcpy(strCheck, strLook.c_str());
-        strCheck[nStart] = 0;
-        char *pCheck = strrchr(strCheck, '\n');
-        // if there's a commentary sign in-between we'll continue
-        if (pCheck && strstr(pCheck, "//")) {
-            delete[] strCheck;
-            nOffset = nStart + 1;
-            continue;
-        }
-        delete[] strCheck;
-        nOffset = nStart;
-        break;
-    }
-    // now close the file
-    vfsFreeFile(pBuff);
+void ViewShader( const char *pFile, const char *pName ){
+       char* pBuff = 0;
+       //int nSize =
+       vfsLoadFile( pFile, reinterpret_cast<void**>( &pBuff ) );
+       if ( pBuff == 0 ) {
+               globalErrorStream() << "Failed to load shader file " << pFile << "\n";
+               return;
+       }
+       // look for the shader declaration
+       StringOutputStream strFind( string_length( pName ) );
+       strFind << LowerCase( pName );
+       StringOutputStream strLook( string_length( pBuff ) );
+       strLook << LowerCase( pBuff );
+       // offset used when jumping over commented out definitions
+       int length = string_length( pBuff );
+       std::size_t nOffset = 0;
+       bool startOK = false;
+       bool endOK = false;
+       while ( !startOK || !endOK ){
+               const char* substr = strstr( strLook.c_str() + nOffset, strFind.c_str() );
+               if ( substr == 0 ) {
+                       break;
+               }
+               std::size_t nStart = substr - strLook.c_str();
+               startOK = endOK = false;
+               if ( nStart == 0 ){
+                       startOK = true;
+               }
+               //validate found one...
+               for ( const char* i = substr - 1; i > strLook.c_str(); i-- ){
+                       if( (strncmp( i, "\t", 1 ) == 0) || (strncmp( i, " ", 1 ) == 0) ){
+                               startOK = true;
+                               continue;
+                       }
+                       else if ( (strncmp( i, "\n", 1 ) == 0) || (strncmp( i, "\r", 1 ) == 0) ){
+                               startOK = true;
+                               break;
+                       }
+                       else{
+                               startOK = false;
+                               break;
+                       }
+               }
+               const char* b = strLook.c_str() + strlen( strLook.c_str() );
+               for ( const char* i = substr + strlen( strFind.c_str() ); i < b; i++ ){
+                       if( (strncmp( i, "\t", 1 ) == 0) || (strncmp( i, " ", 1 ) == 0) ){
+                               endOK = true;
+                               continue;
+                       }
+                       else if ( (strncmp( i, "\n", 1 ) == 0) || (strncmp( i, "\r", 1 ) == 0) || (strncmp( i, "{", 1 ) == 0) || (strncmp( i, ":q3map", 6 ) == 0) ){
+                               endOK = true;
+                               break;
+                       }
+                       else{
+                               endOK = false;
+                               break;
+                       }
+               }
+               if( !startOK || !endOK ){
+                       nOffset = nStart + 1;
+               }
+               else{
+                       //globalErrorStream() << "Validated successfully" << "\n";
+                       nOffset = nStart;
+                       //fix cr+lf
+                       for ( const char* i = strLook.c_str(); i < substr ; i++ ){
+                               if ( (strncmp( i, "\r\n", 2 ) == 0) ){
+                               nOffset--;
+                               }
+                       }
+               }
+               /*// we have found something, maybe it's a commented out shader name?
+               char *strCheck = new char[string_length( strLook.c_str() ) + 1];
+               strcpy( strCheck, strLook.c_str() );
+               strCheck[nStart] = 0;
+               char *pCheck = strrchr( strCheck, '\n' );
+               // if there's a commentary sign in-between we'll continue
+               if ( pCheck && strstr( pCheck, "//" ) ) {
+                       delete[] strCheck;
+                       nOffset = nStart + 1;
+                       continue;
+               }
+               delete[] strCheck;
+               nOffset = nStart;
+               break;*/
+       }
+       //fix up length
+       const char* b = strLook.c_str() + strlen( strLook.c_str() ) - 1;
+       for ( const char* i = strLook.c_str(); i < b; i++ ){
+               if ( (strncmp( i, "\r\n", 2 ) == 0) ){
+               length--;
+               }
+       }
+       // now close the file
+       vfsFreeFile( pBuff );
 
-    DoTextEditor(pFile, static_cast<int>( nOffset ));
+       DoTextEditor( pFile, static_cast<int>( nOffset ), length );
 }