diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index af0f2f9f5..37ba57c53 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -2630,7 +2630,7 @@ Torque::Path AssetImporter::importMaterialAsset(AssetImportObject* assetItem) StringTableEntry assetName = StringTable->insert(assetItem->assetName.c_str()); String tamlPath = targetPath + "/" + assetName + ".asset.taml"; - String scriptName = assetItem->assetName + ".cs"; + String scriptName = assetItem->assetName + "." TORQUE_SCRIPT_EXTENSION; String scriptPath = targetPath + "/" + scriptName; String originalPath = assetItem->filePath.getFullPath().c_str(); @@ -2717,7 +2717,7 @@ Torque::Path AssetImporter::importMaterialAsset(AssetImportObject* assetItem) //Now write the script file containing our material out //There's 2 ways to do this. If we're in-place importing an existing asset, we can see if the definition existed already, like in an old - //materials.cs file. if it does, we can just find the object by name, and save it out to our new file + //materials.tscript file. if it does, we can just find the object by name, and save it out to our new file //If not, we'll just generate one Material* existingMat = MATMGR->getMaterialDefinitionByName(assetName); @@ -2878,10 +2878,10 @@ Torque::Path AssetImporter::importShapeAsset(AssetImportObject* assetItem) String shapeFileName = assetItem->filePath.getFileName() + "." + assetItem->filePath.getExtension(); String assetPath = targetPath + "/" + shapeFileName; - String constructorPath = targetPath + "/" + assetItem->filePath.getFileName() + ".cs"; + String constructorPath = targetPath + "/" + assetItem->filePath.getFileName() + "." TORQUE_SCRIPT_EXTENSION; String tamlPath = targetPath + "/" + assetName + ".asset.taml"; String originalPath = assetItem->filePath.getFullPath().c_str(); - String originalConstructorPath = assetItem->filePath.getPath() + "/" + assetItem->filePath.getFileName() + ".cs"; + String originalConstructorPath = assetItem->filePath.getPath() + "/" + assetItem->filePath.getFileName() + "." TORQUE_SCRIPT_EXTENSION; char qualifiedFromFile[2048]; char qualifiedToFile[2048]; diff --git a/Engine/source/T3D/fx/fxFoliageReplicator.cpp b/Engine/source/T3D/fx/fxFoliageReplicator.cpp index eef88d24a..5078389bf 100644 --- a/Engine/source/T3D/fx/fxFoliageReplicator.cpp +++ b/Engine/source/T3D/fx/fxFoliageReplicator.cpp @@ -87,13 +87,13 @@ GFXImplementVertexFormat( GFXVertexFoliage ) // //------------------------------------------------------------------------------ // -// Put this in /example/common/editor/EditorGui.cs in [function Creator::init( %this )] +// Put this in /example/common/editor/EditorGui.tscript in [function Creator::init( %this )] // // %Environment_Item[8] = "fxFoliageReplicator"; <-- ADD THIS. // //------------------------------------------------------------------------------ // -// Put this in /example/common/client/missionDownload.cs in [function clientCmdMissionStartPhase3(%seq,%missionName)] (line 65) +// Put this in /example/common/client/missionDownload.tscript in [function clientCmdMissionStartPhase3(%seq,%missionName)] (line 65) // after codeline 'onPhase2Complete();'. // // StartFoliageReplication(); diff --git a/Engine/source/T3D/fx/fxShapeReplicator.cpp b/Engine/source/T3D/fx/fxShapeReplicator.cpp index 5df330a0b..1df326e45 100644 --- a/Engine/source/T3D/fx/fxShapeReplicator.cpp +++ b/Engine/source/T3D/fx/fxShapeReplicator.cpp @@ -37,14 +37,14 @@ //------------------------------------------------------------------------------ // -// Put this in /example/common/editor/editor.cs in function [Editor::create()] (around line 66). +// Put this in /example/common/editor/editor.tscript in function [Editor::create()] (around line 66). // // // Ignore Replicated fxStatic Instances. // EWorldEditor.ignoreObjClass("fxShapeReplicatedStatic"); // //------------------------------------------------------------------------------ // -// Put this in /example/common/editor/EditorGui.cs in [function Creator::init( %this )] +// Put this in /example/common/editor/EditorGui.tscript in [function Creator::init( %this )] // // %Environment_Item[8] = "fxShapeReplicator"; <-- ADD THIS. // @@ -60,7 +60,7 @@ // //------------------------------------------------------------------------------ // -// Put this in /example/common/client/missionDownload.cs in [function clientCmdMissionStartPhase3(%seq,%missionName)] (line 65) +// Put this in /example/common/client/missionDownload.tscript in [function clientCmdMissionStartPhase3(%seq,%missionName)] (line 65) // after codeline 'onPhase2Complete();'. // // StartClientReplication(); diff --git a/Engine/source/T3D/gameBase/gameConnection.h b/Engine/source/T3D/gameBase/gameConnection.h index cffd89d2d..e71db483f 100644 --- a/Engine/source/T3D/gameBase/gameConnection.h +++ b/Engine/source/T3D/gameBase/gameConnection.h @@ -62,8 +62,8 @@ struct AuthInfo; // To disable datablock caching, remove or comment out the AFX_CAP_DATABLOCK_CACHE define below. // Also, at a minimum, the following script preferences should be set to false: -// $pref::Client::EnableDatablockCache = false; (in arcane.fx/client/defaults.cs) -// $Pref::Server::EnableDatablockCache = false; (in arcane.fx/server/defaults.cs) +// $pref::Client::EnableDatablockCache = false; (in arcane.fx/client/defaults.tscript) +// $Pref::Server::EnableDatablockCache = false; (in arcane.fx/server/defaults.tscript) // Alternatively, all script code marked with "DATABLOCK CACHE CODE" can be removed or // commented out. // diff --git a/Engine/source/T3D/lightFlareData.cpp b/Engine/source/T3D/lightFlareData.cpp index 7eada6bf9..7acdbf727 100644 --- a/Engine/source/T3D/lightFlareData.cpp +++ b/Engine/source/T3D/lightFlareData.cpp @@ -85,7 +85,7 @@ ConsoleDocClass( LightFlareData, "as a 2D sprite in screenspace.\n\n" "@tsexample\n" - "// example from Full Template, core/art/datablocks/lights.cs\n" + "// example from Full Template, core/art/datablocks/lights." TORQUE_SCRIPT_EXTENSION "\n" "datablock LightFlareData( LightFlareExample0 )\n" "{\n" " overallScale = 2.0;\n" @@ -676,4 +676,4 @@ DefineEngineMethod( LightFlareData, apply, void, (),, ) { object->inspectPostApply(); -} \ No newline at end of file +} diff --git a/Engine/source/app/banList.cpp b/Engine/source/app/banList.cpp index 4e7de54a2..8ed327ab8 100644 --- a/Engine/source/app/banList.cpp +++ b/Engine/source/app/banList.cpp @@ -294,7 +294,7 @@ DefineEngineStaticMethod( BanList, export, void, ( const char* filename ),, "Dump the banlist to a file.\n\n" "@param filename Path of the file to write the list to.\n\n" "@tsexample\n" - "BanList::Export(\"./server/banlist.cs\");\n" + "BanList::Export(\"./server/banlist." TORQUE_SCRIPT_EXTENSION "\");\n" "@endtsexample\n\n") { BanList::instance()->exportToFile( filename ); diff --git a/Engine/source/app/mainLoop.cpp b/Engine/source/app/mainLoop.cpp index 68689312d..13a331075 100644 --- a/Engine/source/app/mainLoop.cpp +++ b/Engine/source/app/mainLoop.cpp @@ -436,7 +436,7 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv ) } #endif - // Executes an entry script file. This is "main.cs" + // Executes an entry script file. This is "main.tscript" // by default, but any file name (with no whitespace // in it) may be run if it is specified as the first // command-line parameter. The script used, default @@ -459,7 +459,7 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv ) // The working filestream. FileStream str; - const char *defaultScriptName = "main.cs"; + const char *defaultScriptName = "main." TORQUE_SCRIPT_EXTENSION; bool useDefaultScript = true; // Check if any command-line parameters were passed (the first is just the app name). @@ -493,14 +493,14 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv ) { OpenFileDialog ofd; FileDialogData &fdd = ofd.getData(); - fdd.mFilters = StringTable->insert("Main Entry Script (main.cs)|main.cs|"); + fdd.mFilters = StringTable->insert("Main Entry Script (main." TORQUE_SCRIPT_EXTENSION ")|main." TORQUE_SCRIPT_EXTENSION "|"); fdd.mTitle = StringTable->insert("Locate Game Entry Script"); // Get the user's selection if( !ofd.Execute() ) return false; - // Process and update CWD so we can run the selected main.cs + // Process and update CWD so we can run the selected main.tscript S32 pathLen = dStrlen( fdd.mFile ); FrameTemp szPathCopy( pathLen + 1); @@ -570,6 +570,7 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv ) Platform::setMainDotCsDir(buffer); Platform::setCurrentDirectory(buffer); + Con::setVariable("TorqueScriptFileExtension", TORQUE_SCRIPT_EXTENSION); Con::evaluate(script, false, useDefaultScript ? defaultScriptName : argv[1]); delete[] script; diff --git a/Engine/source/app/mainLoop.h b/Engine/source/app/mainLoop.h index b7baad503..1f72abce4 100644 --- a/Engine/source/app/mainLoop.h +++ b/Engine/source/app/mainLoop.h @@ -32,7 +32,7 @@ public: /// Initialize core libraries and call registered init functions static void init(); - /// Pass command line arguments to registered functions and main.cs + /// Pass command line arguments to registered functions and main.tscript static bool handleCommandLine(S32 argc, const char **argv); /// A standard mainloop implementation. @@ -53,4 +53,4 @@ private: static void preShutdown(); }; -#endif \ No newline at end of file +#endif diff --git a/Engine/source/app/net/net.cpp b/Engine/source/app/net/net.cpp index abec3ccc1..3de813e89 100644 --- a/Engine/source/app/net/net.cpp +++ b/Engine/source/app/net/net.cpp @@ -220,7 +220,7 @@ DefineEngineStringlyVariadicFunction( commandToServer, void, 2, RemoteCommandEve "@tsexample\n" "// Create a standard function. Needs to be executed on the client, such \n" - "// as within scripts/client/default.bind.cs\n" + "// as within scripts/client/default.bind." TORQUE_SCRIPT_EXTENSION "\n" "function toggleCamera(%val)\n" "{\n" " // If key was down, call a server command named 'ToggleCamera'\n" @@ -228,7 +228,7 @@ DefineEngineStringlyVariadicFunction( commandToServer, void, 2, RemoteCommandEve " commandToServer('ToggleCamera');\n" "}\n\n" "// Server command being called from above. Needs to be executed on the \n" - "// server, such as within scripts/server/commands.cs\n" + "// server, such as within scripts/server/commands." TORQUE_SCRIPT_EXTENSION "\n" "function serverCmdToggleCamera(%client)\n" "{\n" " if (%client.getControlObject() == %client.player)\n" @@ -264,7 +264,7 @@ DefineEngineStringlyVariadicFunction( commandToClient, void, 3, RemoteCommandEve "@tsexample\n" "// Set up the client command. Needs to be executed on the client, such as\n" - "// within scripts/client/client.cs\n" + "// within scripts/client/client." TORQUE_SCRIPT_EXTENSION "\n" "// Update the Ammo Counter with current ammo, if not any then hide the counter.\n" "function clientCmdSetAmmoAmountHud(%amount)\n" "{\n" @@ -277,7 +277,7 @@ DefineEngineStringlyVariadicFunction( commandToClient, void, 3, RemoteCommandEve " }\n" "}\n\n" "// Call it from a server function. Needs to be executed on the server, \n" - "//such as within scripts/server/game.cs\n" + "//such as within scripts/server/game." TORQUE_SCRIPT_EXTENSION "\n" "function GameConnection::setAmmoAmountHud(%client, %amount)\n" "{\n" " commandToClient(%client, 'SetAmmoAmountHud', %amount);\n" diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 4d6519514..39d4b204d 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -323,7 +323,7 @@ void init() ConsoleConstructor::setup(); // Set up the parser(s) - CON_ADD_PARSER(CMD, "cs", true); // TorqueScript + CON_ADD_PARSER(CMD, TORQUE_SCRIPT_EXTENSION, true); // TorqueScript // Setup the console types. ConsoleBaseType::initialize(); @@ -1184,7 +1184,7 @@ bool executeFile(const char* fileName, bool noCalls, bool journalScript) Con::expandScriptFilename(scriptFilenameBuffer, sizeof(scriptFilenameBuffer), fileName); // since this function expects a script file reference, if it's a .dso - // lets terminate the string before the dso so it will act like a .cs + // lets terminate the string before the dso so it will act like a .tscript if (dStrEndsWith(scriptFilenameBuffer, ".dso")) { scriptFilenameBuffer[dStrlen(scriptFilenameBuffer) - dStrlen(".dso")] = '\0'; @@ -1197,6 +1197,13 @@ bool executeFile(const char* fileName, bool noCalls, bool journalScript) if (!ext) { + // Try appending the default script extension and see if that succeeds + + if (executeFile(fileName + String("." TORQUE_SCRIPT_EXTENSION), noCalls, journalScript)) + { + return true; + } + // We need an extension! Con::errorf(ConsoleLogEntry::Script, "exec: invalid script file name %s.", scriptFilenameBuffer); execDepth--; @@ -1206,11 +1213,11 @@ bool executeFile(const char* fileName, bool noCalls, bool journalScript) // Check Editor Extensions bool isEditorScript = false; - // If the script file extension is '.ed.cs' then compile it to a different compiled extension - if (dStricmp(ext, ".cs") == 0) + // If the script file extension is '.ed.tscript' then compile it to a different compiled extension + if (dStricmp(ext, "." TORQUE_SCRIPT_EXTENSION) == 0) { const char* ext2 = ext - 3; - if (dStricmp(ext2, ".ed.cs") == 0) + if (dStricmp(ext2, ".ed." TORQUE_SCRIPT_EXTENSION) == 0) isEditorScript = true; } else if (dStricmp(ext, ".gui") == 0) diff --git a/Engine/source/console/console.h b/Engine/source/console/console.h index 4c07e926b..ad4d4f622 100644 --- a/Engine/source/console/console.h +++ b/Engine/source/console/console.h @@ -468,11 +468,11 @@ namespace Con /// This is used in (among other places) the exec() script function, which /// takes a parameter indicating a script file and executes it. Script paths /// can be one of: - /// - Absolute: fps/foo/bar.cs Paths of this sort are passed + /// - Absolute: fps/foo/bar.tscript Paths of this sort are passed /// through. - /// - Mod-relative: ~/foo/bar.cs Paths of this sort have their + /// - Mod-relative: ~/foo/bar.tscript Paths of this sort have their /// replaced with the name of the current mod. - /// - File-relative: ./baz/blip.cs Paths of this sort are + /// - File-relative: ./baz/blip.tscript Paths of this sort are /// calculated relative to the path of the current scripting file. /// /// @note This function determines paths relative to the currently executing diff --git a/Engine/source/console/consoleDoc.h b/Engine/source/console/consoleDoc.h index 77107ee75..16b2c5427 100644 --- a/Engine/source/console/consoleDoc.h +++ b/Engine/source/console/consoleDoc.h @@ -75,7 +75,7 @@ /// setName() - obj.setName(newName) /// @endcode /// -/// In the Torque example app, there are two functions defined in common\\client\\scriptDoc.cs +/// In the Torque example app, there are two functions defined in common\\client\\scriptDoc.tscript /// which automate the process of dumping the documentation. They make use of the ConsoleLogger /// object to output the documentation to a file, and look like this: /// diff --git a/Engine/source/console/consoleFunctions.cpp b/Engine/source/console/consoleFunctions.cpp index 8b75b7afd..797678d93 100644 --- a/Engine/source/console/consoleFunctions.cpp +++ b/Engine/source/console/consoleFunctions.cpp @@ -787,7 +787,7 @@ DefineEngineFunction( strIsMatchMultipleExpr, bool, ( const char* patterns, cons "this string. If false, differences in casing are ignored.\n" "@return True if @a str matches any of the given @a patterns.\n\n" "@tsexample\n" - "strIsMatchMultipleExpr( \"*.cs *.gui *.mis\", \"mymission.mis\" ) // Returns true.\n" + "strIsMatchMultipleExpr( \"*." TORQUE_SCRIPT_EXTENSION " *.gui *.mis\", \"mymission.mis\" ) // Returns true.\n" "@endtsexample\n" "@see strIsMatchExpr\n" "@ingroup Strings" ) @@ -1200,7 +1200,7 @@ DefineEngineFunction( isValidIP, bool, ( const char* str),, //---------------------------------------------------------------- // Torque won't normally add another string if it already exists with another casing, -// so this forces the addition. It should be called once near the start, such as in main.cs. +// so this forces the addition. It should be called once near the start, such as in main.tscript. DefineEngineStringlyVariadicFunction(addCaseSensitiveStrings,void,2,0,"[string1, string2, ...]" "Adds case sensitive strings to the StringTable.") { @@ -1810,7 +1810,7 @@ DefineEngineFunction( detag, const char*, ( const char* str ),, "to convert a tagged string ID back into a regular string at any time.\n\n" "@tsexample\n" - "// From scripts/client/message.cs\n" + "// From scripts/client/message. " TORQUE_SCRIPT_EXTENSION "\n" "function clientCmdChatMessage(%sender, %voice, %pitch, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8, %a9, %a10)\n" "{\n" " onChatMessage(detag(%msgString), %voice, %pitch);\n" @@ -2262,7 +2262,7 @@ static U32 journalDepth = 1; DefineEngineFunction( getDSOPath, const char*, ( const char* scriptFileName ),, "Get the absolute path to the file in which the compiled code for the given script file will be stored.\n" - "@param scriptFileName %Path to the .cs script file.\n" + "@param scriptFileName %Path to the ." TORQUE_SCRIPT_EXTENSION " script file.\n" "@return The absolute path to the .dso file for the given script file.\n\n" "@note The compiler will store newly compiled DSOs in the prefs path but pre-existing DSOs will be loaded " "from the current paths.\n\n" @@ -2303,13 +2303,13 @@ DefineEngineFunction( compile, bool, ( const char* fileName, bool overrideNoDSO if(dsoPath && *dsoPath == 0) return false; - // If the script file extention is '.ed.cs' then compile it to a different compiled extention + // If the script file extention is '.ed.tscript' then compile it to a different compiled extention bool isEditorScript = false; const char *ext = dStrrchr( scriptFilenameBuffer, '.' ); - if( ext && ( dStricmp( ext, ".cs" ) == 0 ) ) + if( ext && ( dStricmp( ext, "." TORQUE_SCRIPT_EXTENSION) == 0 ) ) { const char* ext2 = ext - 3; - if( dStricmp( ext2, ".ed.cs" ) == 0 ) + if( dStricmp( ext2, ".ed." TORQUE_SCRIPT_EXTENSION) == 0 ) isEditorScript = true; } else if( ext && ( dStricmp( ext, ".gui" ) == 0 ) ) @@ -2364,8 +2364,8 @@ DefineEngineFunction( exec, bool, ( const char* fileName, bool noCalls, bool jou "@param journalScript Deprecated\n" "@return True if the script was successfully executed, false if not.\n\n" "@tsexample\n" - "// Execute the init.cs script file found in the same directory as the current script file.\n" - "exec( \"./init.cs\" );\n" + "// Execute the init." TORQUE_SCRIPT_EXTENSION " script file found in the same directory as the current script file.\n" + "exec( \"./init." TORQUE_SCRIPT_EXTENSION "\" );\n" "@endtsexample\n\n" "@see compile\n" "@see eval\n" @@ -2684,8 +2684,8 @@ DefineEngineFunction( export, void, ( const char* pattern, const char* filename, "@param append If true and @a fileName is not \"\", then the definitions are appended to the specified file. " "Otherwise existing contents of the file (if any) will be overwritten.\n\n" "@tsexample\n" - "// Write out all preference variables to a prefs.cs file.\n" - "export( \"$prefs::*\", \"prefs.cs\" );\n" + "// Write out all preference variables to a prefs." TORQUE_SCRIPT_EXTENSION " file.\n" + "export( \"$prefs::*\", \"prefs." TORQUE_SCRIPT_EXTENSION "\" );\n" "@endtsexample\n\n" "@ingroup Scripting" ) { diff --git a/Engine/source/console/consoleParser.h b/Engine/source/console/consoleParser.h index ac1badaae..cc18fcf9d 100644 --- a/Engine/source/console/consoleParser.h +++ b/Engine/source/console/consoleParser.h @@ -103,7 +103,7 @@ void freeConsoleParserList(void); /// \param p Parse function /// \param r Restart function /// \param ssb SetScanBuffer function -/// \param def true if this is the default parser (Note: set this only on the .cs parser!) +/// \param def true if this is the default parser (Note: set this only on the .tscript parser!) /// \return true for success, false for failure (out of memory) /// \sa FreeConsoleParserList(), ConsoleParser //----------------------------------------------------------------------------- diff --git a/Engine/source/console/fileSystemFunctions.cpp b/Engine/source/console/fileSystemFunctions.cpp index b4f618f50..fd114b71d 100644 --- a/Engine/source/console/fileSystemFunctions.cpp +++ b/Engine/source/console/fileSystemFunctions.cpp @@ -156,8 +156,8 @@ DefineEngineFunction( findFirstFile, String, ( const char* pattern, bool recurse "@return The path of the first file matched by the search or an empty string if no matching file could be found.\n\n" "@tsexample\n" - "// Execute all .cs files in a subdirectory and its subdirectories.\n" - "for( %file = findFirstFile( \"subdirectory/*.cs\" ); %file !$= \"\"; %file = findNextFile() )\n" + "// Execute all ." TORQUE_SCRIPT_EXTENSION " files in a subdirectory and its subdirectories.\n" + "for( %file = findFirstFile( \"subdirectory/*." TORQUE_SCRIPT_EXTENSION "\" ); %file !$= \"\"; %file = findNextFile() )\n" " exec( %file );\n" "@endtsexample\n\n" @@ -193,8 +193,8 @@ DefineEngineFunction( findNextFile, String, ( const char* pattern ), ( "" ), "@return The path of the next filename matched by the search or an empty string if no more files match.\n\n" "@tsexample\n" - "// Execute all .cs files in a subdirectory and its subdirectories.\n" - "for( %file = findFirstFile( \"subdirectory/*.cs\" ); %file !$= \"\"; %file = findNextFile() )\n" + "// Execute all ." TORQUE_SCRIPT_EXTENSION " files in a subdirectory and its subdirectories.\n" + "for( %file = findFirstFile( \"subdirectory/*." TORQUE_SCRIPT_EXTENSION "\" ); %file !$= \"\"; %file = findNextFile() )\n" " exec( %file );\n" "@endtsexample\n\n" @@ -224,8 +224,8 @@ DefineEngineFunction( getFileCount, S32, ( const char* pattern, bool recurse ), "@return Number of files located using the pattern\n\n" "@tsexample\n" - "// Count the number of .cs files in a subdirectory and its subdirectories.\n" - "getFileCount( \"subdirectory/*.cs\" );\n" + "// Count the number of ." TORQUE_SCRIPT_EXTENSION " files in a subdirectory and its subdirectories.\n" + "getFileCount( \"subdirectory/*." TORQUE_SCRIPT_EXTENSION "\" );\n" "@endtsexample\n\n" "@see findFirstFile()" @@ -259,8 +259,8 @@ DefineEngineFunction(findFirstFileMultiExpr, String, ( const char* pattern, bool "call to findFirstFile() and findFirstFileMultiExpr() initiates a new search and renders " "a previous search invalid.\n\n" - "@param pattern The path and file name pattern to match against, such as *.cs. Separate " - "multiple patterns with TABs. For example: \"*.cs\" TAB \"*.dso\"\n" + "@param pattern The path and file name pattern to match against, such as *." TORQUE_SCRIPT_EXTENSION ". Separate " + "multiple patterns with TABs. For example: \"*." TORQUE_SCRIPT_EXTENSION "\" TAB \"*.dso\"\n" "@param recurse If true, the search will exhaustively recurse into subdirectories " "of the given path and match the given filename patterns.\n" "@return String of the first matching file path, or an empty string if no matching " @@ -333,8 +333,8 @@ DefineEngineFunction(getFileCountMultiExpr, S32, ( const char* pattern, bool rec "If you're interested in a list of files that match the given patterns and not just " "the number of files, use findFirstFileMultiExpr() and findNextFileMultiExpr().\n\n" - "@param pattern The path and file name pattern to match against, such as *.cs. Separate " - "multiple patterns with TABs. For example: \"*.cs\" TAB \"*.dso\"\n" + "@param pattern The path and file name pattern to match against, such as *." TORQUE_SCRIPT_EXTENSION ". Separate " + "multiple patterns with TABs. For example: \"*." TORQUE_SCRIPT_EXTENSION "\" TAB \"*.dso\"\n" "@param recurse If true, the search will exhaustively recurse into subdirectories " "of the given path and match the given filename pattern.\n" "@return Number of files located using the patterns\n\n" @@ -589,7 +589,7 @@ DefineEngineFunction(fileExt, String, ( const char* fileName ),, "@brief Get the extension of a file\n\n" "@param fileName Name and path of file\n" - "@return String containing the extension, such as \".exe\" or \".cs\"\n" + "@return String containing the extension, such as \".exe\" or \"." TORQUE_SCRIPT_EXTENSION "\"\n" "@ingroup FileSystem") { const char *ret = dStrrchr(fileName, '.'); @@ -744,7 +744,7 @@ DefineEngineFunction(getExecutableName, String, (),, //----------------------------------------------------------------------------- DefineEngineFunction( getMainDotCsDir, String, (),, - "@brief Get the absolute path to the directory that contains the main.cs script from which the engine was started.\n\n" + "@brief Get the absolute path to the directory that contains the main." TORQUE_SCRIPT_EXTENSION " script from which the engine was started.\n\n" "This directory will usually contain all the game assets and, in a user-side game installation, will usually be " "read-only.\n\n" diff --git a/Engine/source/console/telnetDebugger.h b/Engine/source/console/telnetDebugger.h index 5a30c9cf7..5ba6b0f10 100644 --- a/Engine/source/console/telnetDebugger.h +++ b/Engine/source/console/telnetDebugger.h @@ -36,7 +36,7 @@ class CodeBlock; /// To use the debugger, use dbgSetParameters(port, password); in the console /// of the server to enable debugger connections. Then on some other system, /// start up the app (you don't have to start a game or connect to the -/// server) and exec("common/debugger/debugger.cs"); in the console. Then use +/// server) and exec("common/debugger/debugger.tscript"); in the console. Then use /// the debugger GUI to connect to the server with the right port and password. /// /// @see http://www.planettribes.com/tribes2/editing.shtml for more thorough discussion. diff --git a/Engine/source/core/util/zip/zipVolume.cpp b/Engine/source/core/util/zip/zipVolume.cpp index 6982c70c0..2f2e173ed 100644 --- a/Engine/source/core/util/zip/zipVolume.cpp +++ b/Engine/source/core/util/zip/zipVolume.cpp @@ -409,7 +409,7 @@ FileNodeRef ZipFileSystem::resolve(const Path& path) // If a zip file's name isn't the root of the path we're looking for // then do not continue. Otherwise, we'll continue to look for the // path's root within the zip file itself. i.e. we're looking for the - // path "scripts/test.cs". If the zip file itself isn't called scripts.zip + // path "scripts/test.tscript". If the zip file itself isn't called scripts.zip // then we won't look within the archive for a "scripts" directory. return NULL; #endif @@ -472,4 +472,4 @@ void ZipFileSystem::_init() //mZipArchive->dumpCentralDirectory(); } -}; \ No newline at end of file +}; diff --git a/Engine/source/core/virtualMountSystem.h b/Engine/source/core/virtualMountSystem.h index e7e3ca181..875e68993 100644 --- a/Engine/source/core/virtualMountSystem.h +++ b/Engine/source/core/virtualMountSystem.h @@ -46,7 +46,7 @@ namespace FS /// 3) Nothing special is done for the WriteAppend case; that is, it follows the same logic as if you were /// just trying to Write the file. /// - /// Because of rule 1) above, you should take care that any files you need to write (such as prefs.cs), are not + /// Because of rule 1) above, you should take care that any files you need to write (such as prefs.tscript), are not /// included in read-only zip archive files. class VirtualMountSystem : public MountSystem { diff --git a/Engine/source/gfx/gfxCardProfile.cpp b/Engine/source/gfx/gfxCardProfile.cpp index 066dd3b3a..525d3264c 100644 --- a/Engine/source/gfx/gfxCardProfile.cpp +++ b/Engine/source/gfx/gfxCardProfile.cpp @@ -64,16 +64,16 @@ void GFXCardProfiler::loadProfileScript(const char* aScriptName) void GFXCardProfiler::loadProfileScripts(const String& render, const String& vendor, const String& card, const String& version) { - String script = render + ".cs"; + String script = render + "." TORQUE_SCRIPT_EXTENSION; loadProfileScript(script); - script = render + "." + vendor + ".cs"; + script = render + "." + vendor + "." TORQUE_SCRIPT_EXTENSION; loadProfileScript(script); - script = render + "." + vendor + "." + card + ".cs"; + script = render + "." + vendor + "." + card + "." TORQUE_SCRIPT_EXTENSION; loadProfileScript(script); - script = render + "." + vendor + "." + card + "." + version + ".cs"; + script = render + "." + vendor + "." + card + "." + version + "." TORQUE_SCRIPT_EXTENSION; loadProfileScript(script); } diff --git a/Engine/source/gui/controls/guiFileTreeCtrl.cpp b/Engine/source/gui/controls/guiFileTreeCtrl.cpp index e35b464a9..3baff1b84 100644 --- a/Engine/source/gui/controls/guiFileTreeCtrl.cpp +++ b/Engine/source/gui/controls/guiFileTreeCtrl.cpp @@ -67,7 +67,7 @@ GuiFileTreeCtrl::GuiFileTreeCtrl() mSupportMouseDragging = false; mMultipleSelections = false; - mFileFilter = "*.cs *.gui *.ed.cs"; + mFileFilter = "*." TORQUE_SCRIPT_EXTENSION " *.gui *.ed." TORQUE_SCRIPT_EXTENSION; _initFilters(); } @@ -111,7 +111,7 @@ void GuiFileTreeCtrl::updateTree() if( !mRootPath.isEmpty() ) rootPath = String::ToString( "%s/%s", rootPath.c_str(), mRootPath.c_str() ); - // get the files in the main.cs dir + // get the files in the main.tscript dir Vector pathVec; Platform::dumpDirectories( rootPath, pathVec, 0, true); _dumpFiles( rootPath, pathVec, 0); diff --git a/Engine/source/i18n/lang.cpp b/Engine/source/i18n/lang.cpp index 724d88abe..e06ad6e4e 100644 --- a/Engine/source/i18n/lang.cpp +++ b/Engine/source/i18n/lang.cpp @@ -510,7 +510,7 @@ bool compiledFileNeedsUpdate(UTF8* filename) DefineEngineFunction(CompileLanguage, void, (const char* inputFile, bool createMap), (false), "@brief Compiles a LSO language file." - " if createIndex is true, will also create languageMap.cs with" + " if createIndex is true, will also create languageMap." TORQUE_SCRIPT_EXTENSION " with" " the global variables for each string index." " The input file must follow this example layout:" " TXT_HELLO_WORLD = Hello world in english!") @@ -538,9 +538,9 @@ DefineEngineFunction(CompileLanguage, void, (const char* inputFile, bool createM { Torque::Path mapPath = scriptFilenameBuffer; mapPath.setFileName("languageMap"); - mapPath.setExtension("cs"); + mapPath.setExtension(TORQUE_SCRIPT_EXTENSION); if ((mapStream = FileStream::createAndOpen(mapPath, Torque::FS::File::Write)) == NULL) - Con::errorf("CompileLanguage - failed creating languageMap.cs"); + Con::errorf("CompileLanguage - failed creating languageMap." TORQUE_SCRIPT_EXTENSION); } LangFile langFile; diff --git a/Engine/source/materials/materialDefinition.cpp b/Engine/source/materials/materialDefinition.cpp index 24c736eb2..14093c17d 100644 --- a/Engine/source/materials/materialDefinition.cpp +++ b/Engine/source/materials/materialDefinition.cpp @@ -532,7 +532,7 @@ bool Material::onAdd() matSet->addObject( (SimObject*)this ); // save the current script path for texture lookup later - const String scriptFile = Con::getVariable("$Con::File"); // current script file - local materials.cs + const String scriptFile = Con::getVariable("$Con::File"); // current script file - local materials.tscript String::SizeType slash = scriptFile.find( '/', scriptFile.length(), String::Right ); if ( slash != String::NPos ) diff --git a/Engine/source/platform/platform.h b/Engine/source/platform/platform.h index b31356e67..7158c5163 100644 --- a/Engine/source/platform/platform.h +++ b/Engine/source/platform/platform.h @@ -267,12 +267,12 @@ namespace Platform /// Returns full pathname of the torque executable without filename StringTableEntry getExecutablePath(); - /// Returns the full path to the directory that contains main.cs. + /// Returns the full path to the directory that contains main.tscript. /// Tools scripts are validated as such if they are in this directory or a /// subdirectory of this directory. StringTableEntry getMainDotCsDir(); - /// Set main.cs directory. Used in runEntryScript() + /// Set main.tscript directory. Used in runEntryScript() void setMainDotCsDir(const char *dir); StringTableEntry getPrefsPath(const char *file = NULL); diff --git a/Engine/source/renderInstance/renderDeferredMgr.cpp b/Engine/source/renderInstance/renderDeferredMgr.cpp index 5adda3c3f..e8222c224 100644 --- a/Engine/source/renderInstance/renderDeferredMgr.cpp +++ b/Engine/source/renderInstance/renderDeferredMgr.cpp @@ -67,7 +67,7 @@ ConsoleDocClass( RenderDeferredMgr, "and render them to the g-buffer for use in lighting the scene and doing effects.\n\n" "PostEffect and other shaders can access the output of this bin by using the #deferred " "texture target name. See the edge anti-aliasing post effect for an example.\n\n" - "@see game/core/scripts/client/postFx/edgeAA.cs\n" + "@see game/core/scripts/client/postFx/edgeAA." TORQUE_SCRIPT_EXTENSION "\n" "@ingroup RenderBin\n" ); diff --git a/Engine/source/renderInstance/renderFormatChanger.cpp b/Engine/source/renderInstance/renderFormatChanger.cpp index 8bdeaefd0..104bf5bd2 100644 --- a/Engine/source/renderInstance/renderFormatChanger.cpp +++ b/Engine/source/renderInstance/renderFormatChanger.cpp @@ -42,7 +42,7 @@ ConsoleDocClass( RenderFormatToken, "The RenderPassStateBin manager changes the rendering state associated with " "this token. In stock Torque 3D, a single example exists in the " - "way of AL_FormatToken (found in renderManager.cs). In that script file, all the " + "way of AL_FormatToken (found in renderManager." TORQUE_SCRIPT_EXTENSION "). In that script file, all the " "render managers are intialized, and a single RenderFormatToken is used. This " "implementation basically exists to ensure Advanced Lighting works with MSAA.\n\n" @@ -72,7 +72,7 @@ ConsoleDocClass( RenderFormatToken, "@see RenderPassToken\n\n" "@see RenderPassStateBin\n" - "@see game/core/scripts/client/renderManager.cs\n" + "@see game/core/scripts/client/renderManager." TORQUE_SCRIPT_EXTENSION "\n" "@ingroup GFX\n" ); @@ -381,4 +381,4 @@ void RenderFormatToken::onRemove() mTarget.release(); Parent::onRemove(); -} \ No newline at end of file +} diff --git a/Engine/source/renderInstance/renderPassManager.cpp b/Engine/source/renderInstance/renderPassManager.cpp index 864869caf..f21e6dfcc 100644 --- a/Engine/source/renderInstance/renderPassManager.cpp +++ b/Engine/source/renderInstance/renderPassManager.cpp @@ -110,7 +110,7 @@ ConsoleDocClass( RenderPassManager, "The render pass is used to order a set of RenderBinManager objects which are used " "when rendering a scene. This class does little work itself other than managing " "its list of render bins.\n\n" - "In 'core/scripts/client/renderManager.cs' you will find the DiffuseRenderPassManager " + "In 'core/scripts/client/renderManager." TORQUE_SCRIPT_EXTENSION "' you will find the DiffuseRenderPassManager " "which is used by the C++ engine to render the scene.\n\n" "@see RenderBinManager\n" "@ingroup RenderBin\n" ); diff --git a/Engine/source/renderInstance/renderPassStateToken.cpp b/Engine/source/renderInstance/renderPassStateToken.cpp index b4069490c..560fb40f3 100644 --- a/Engine/source/renderInstance/renderPassStateToken.cpp +++ b/Engine/source/renderInstance/renderPassStateToken.cpp @@ -37,13 +37,13 @@ ConsoleDocClass( RenderPassStateToken, "The RenderPassStateBin manager changes the rendering state associated with " "a token it is declared with. In stock Torque 3D, a single example exists in the " - "way of AL_FormatToken (found in renderManager.cs). In that script file, all the " + "way of AL_FormatToken (found in renderManager." TORQUE_SCRIPT_EXTENSION "). In that script file, all the " "render managers are intialized, and a single RenderFormatToken is used. This " "implementation basically exists to ensure Advanced Lighting works with MSAA.\n\n" "@see RenderFormatToken\n" "@see RenderPassStateBin\n" - "@see game/core/scripts/client/renderManager.cs\n" + "@see game/core/scripts/client/renderManager." TORQUE_SCRIPT_EXTENSION "\n" "@ingroup RenderBin\n" ); @@ -160,4 +160,4 @@ DefineEngineMethod(RenderPassStateToken, toggle, void, (),, "@brief Toggles the token from enabled to disabled or vice versa." ) { object->enable(!object->isEnabled()); -} \ No newline at end of file +} diff --git a/Engine/source/sim/actionMap.cpp b/Engine/source/sim/actionMap.cpp index a69ec4bea..e835273ed 100644 --- a/Engine/source/sim/actionMap.cpp +++ b/Engine/source/sim/actionMap.cpp @@ -2218,8 +2218,8 @@ DefineEngineMethod( ActionMap, save, void, ( const char* fileName, bool append ) " the ActionMap will be dumped to the console.\n" "@param append Whether to write the ActionMap at the end of the file or overwrite it.\n" "@tsexample\n" - "// Write out the actionmap into the config.cs file\n" - "moveMap.save( \"scripts/client/config.cs\" );" + "// Write out the actionmap into the config." TORQUE_SCRIPT_EXTENSION " file\n" + "moveMap.save( \"scripts/client/config." TORQUE_SCRIPT_EXTENSION "\" );" "@endtsexample\n\n") { char buffer[1024]; diff --git a/Engine/source/ts/assimp/assimpAppMaterial.cpp b/Engine/source/ts/assimp/assimpAppMaterial.cpp index 5539ca15a..120c1e51c 100644 --- a/Engine/source/ts/assimp/assimpAppMaterial.cpp +++ b/Engine/source/ts/assimp/assimpAppMaterial.cpp @@ -150,7 +150,7 @@ void AssimpAppMaterial::initMaterial(const Torque::Path& path, Material* mat) co else { // OPAQUE translucent = false; - blendOp = Material::LerpAlpha; // Make default so it doesn't get written to materials.cs + blendOp = Material::LerpAlpha; // Make default so it doesn't get written to materials.tscript } } } @@ -296,7 +296,7 @@ String AssimpAppMaterial::cleanTextureName(String& texName, String& shapeName, c if (nameOnly) cleanStr = foundPath.getFullFileName(); else - { // Unless the file is in the same directory as the materials.cs (covered above) + { // Unless the file is in the same directory as the materials.tscript (covered above) // we need to set the full path from the root directory. If we use "subdirectory/file.ext", // the material manager won't find the image file, but it will be found the next time the // material is loaded from file. If we use "./subdirectory/file.ext", the image will be found diff --git a/Engine/source/ts/assimp/assimpShapeLoader.cpp b/Engine/source/ts/assimp/assimpShapeLoader.cpp index 32336c63c..fccdd13ef 100644 --- a/Engine/source/ts/assimp/assimpShapeLoader.cpp +++ b/Engine/source/ts/assimp/assimpShapeLoader.cpp @@ -427,7 +427,7 @@ void AssimpShapeLoader::updateMaterialsScript(const Torque::Path &path) { Torque::Path scriptPath(path); scriptPath.setFileName("materials"); - scriptPath.setExtension("cs"); + scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION); // First see what materials we need to update PersistenceManager persistMgr; diff --git a/Engine/source/ts/collada/colladaAppMaterial.h b/Engine/source/ts/collada/colladaAppMaterial.h index 1e175675f..429a07e50 100644 --- a/Engine/source/ts/collada/colladaAppMaterial.h +++ b/Engine/source/ts/collada/colladaAppMaterial.h @@ -40,7 +40,7 @@ public: ColladaExtension_effect* effectExt; ///< effect extension String name; ///< Name of this material (cleaned) - // Settings extracted from the Collada file, and optionally saved to materials.cs + // Settings extracted from the Collada file, and optionally saved to materials.tscript String diffuseMap; String normalMap; diff --git a/Engine/source/ts/collada/colladaShapeLoader.cpp b/Engine/source/ts/collada/colladaShapeLoader.cpp index 10c034f23..bd6d47255 100644 --- a/Engine/source/ts/collada/colladaShapeLoader.cpp +++ b/Engine/source/ts/collada/colladaShapeLoader.cpp @@ -453,7 +453,7 @@ void copySketchupTexture(const Torque::Path &path, String &textureFilename) } //----------------------------------------------------------------------------- -/// Add collada materials to materials.cs +/// Add collada materials to materials.tscript void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false) { #ifdef DAE2DTS_TOOL @@ -463,7 +463,7 @@ void updateMaterialsScript(const Torque::Path &path, bool copyTextures = false) Torque::Path scriptPath(path); scriptPath.setFileName("materials"); - scriptPath.setExtension("cs"); + scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION); // First see what materials we need to update PersistenceManager persistMgr; @@ -731,7 +731,7 @@ TSShape* loadColladaShape(const Torque::Path &path) #endif // DAE2DTS_TOOL - // Add collada materials to materials.cs + // Add collada materials to materials.tscript updateMaterialsScript(path, isSketchup); } } diff --git a/Engine/source/ts/collada/colladaUtils.cpp b/Engine/source/ts/collada/colladaUtils.cpp index 8f6289594..9ad2354c4 100644 --- a/Engine/source/ts/collada/colladaUtils.cpp +++ b/Engine/source/ts/collada/colladaUtils.cpp @@ -181,7 +181,7 @@ String ColladaUtils::resolveImagePath(const domImage* image) // it is inside the Torque folder, otherwise force textures // to be in the same folder as the shape. // 2. If the URI string contains a relative path, append it - // to the shape path (since materials.cs cannot handle + // to the shape path (since materials.tscript cannot handle // relative paths). Torque::Path imagePath; diff --git a/Engine/source/ts/collada/colladaUtils.h b/Engine/source/ts/collada/colladaUtils.h index 781c41eee..732042576 100644 --- a/Engine/source/ts/collada/colladaUtils.h +++ b/Engine/source/ts/collada/colladaUtils.h @@ -101,7 +101,7 @@ namespace ColladaUtils bool ignoreNodeScale; // Ignore elements in s bool adjustCenter; // Translate model so origin is at the center bool adjustFloor; // Translate model so origin is at the bottom - bool forceUpdateMaterials; // Force update of materials.cs + bool forceUpdateMaterials; // Force update of materials.tscript bool useDiffuseNames; // Use diffuse texture as the material name // Assimp specific preprocess import options diff --git a/Engine/source/ts/tsShape.cpp b/Engine/source/ts/tsShape.cpp index ef87b1cf2..b3026a98a 100644 --- a/Engine/source/ts/tsShape.cpp +++ b/Engine/source/ts/tsShape.cpp @@ -2112,14 +2112,14 @@ template<> void *Resource::create(const Torque::Path &path) { // Execute the shape script if it exists Torque::Path scriptPath(path); - scriptPath.setExtension("cs"); + scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION); // Don't execute the script if we're already doing so! StringTableEntry currentScript = Platform::stripBasePath(CodeBlock::getCurrentCodeBlockFullPath()); if (!scriptPath.getFullPath().equal(currentScript)) { Torque::Path scriptPathDSO(scriptPath); - scriptPathDSO.setExtension("cs.dso"); + scriptPathDSO.setExtension(TORQUE_SCRIPT_EXTENSION ".dso"); if (Torque::FS::IsFile(scriptPathDSO) || Torque::FS::IsFile(scriptPath)) { diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp index 48c96c40d..a7c150509 100644 --- a/Engine/source/ts/tsShapeConstruct.cpp +++ b/Engine/source/ts/tsShapeConstruct.cpp @@ -313,9 +313,9 @@ void TSShapeConstructor::initPersistFields() "@see adjustCenter" ); addField( "forceUpdateMaterials", TypeBool, Offset(mOptions.forceUpdateMaterials, TSShapeConstructor), - "Forces update of the materials.cs file in the same folder as the COLLADA " + "Forces update of the materials." TORQUE_SCRIPT_EXTENSION " file in the same folder as the COLLADA " "(.dae) file, even if Materials already exist. No effect for DTS files.\n" - "Normally only Materials that are not already defined are written to materials.cs." ); + "Normally only Materials that are not already defined are written to materials." TORQUE_SCRIPT_EXTENSION "." ); // Fields added for assimp options addField( "convertLeftHanded", TypeBool, Offset(mOptions.convertLeftHanded, TSShapeConstructor), @@ -710,11 +710,11 @@ DefineTSShapeConstructorMethod( saveShape, void, ( const char* filename ),, DefineTSShapeConstructorMethod( writeChangeSet, void, (),, (),, "Write the current change set to a TSShapeConstructor script file. The " - "name of the script file is the same as the model, but with .cs extension. " - "eg. myShape.cs for myShape.dts or myShape.dae.\n" ) + "name of the script file is the same as the model, but with ." TORQUE_SCRIPT_EXTENSION " extension. " + "eg. myShape." TORQUE_SCRIPT_EXTENSION " for myShape.dts or myShape.dae.\n" ) { Torque::Path scriptPath( mShapePath ); - scriptPath.setExtension( "cs" ); + scriptPath.setExtension(TORQUE_SCRIPT_EXTENSION); // Read current file contents FileObject f; diff --git a/Templates/BaseGame/game/core/Core.module b/Templates/BaseGame/game/core/Core.module index b9a2490e3..81e086605 100644 --- a/Templates/BaseGame/game/core/Core.module +++ b/Templates/BaseGame/game/core/Core.module @@ -2,7 +2,7 @@ ModuleId="CoreModule" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core.cs" + ScriptFile="Core" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"/> \ No newline at end of file diff --git a/Templates/BaseGame/game/core/Core.cs b/Templates/BaseGame/game/core/Core.tscript similarity index 86% rename from Templates/BaseGame/game/core/Core.cs rename to Templates/BaseGame/game/core/Core.tscript index b03ba52c7..07122e787 100644 --- a/Templates/BaseGame/game/core/Core.cs +++ b/Templates/BaseGame/game/core/Core.tscript @@ -27,10 +27,10 @@ function CoreModule::onCreate(%this) ModuleDatabase.LoadExplicit( "Core_PostFX" ); ModuleDatabase.LoadExplicit( "Core_GameObjects" ); - exec("data/defaults.cs"); + exec("data/defaults." @ $TorqueScriptFileExtension); %prefPath = getPrefpath(); - if ( isFile( %prefPath @ "/clientPrefs.cs" ) ) - exec( %prefPath @ "/clientPrefs.cs" ); + if ( isFile( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ) ) + exec( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ); // Seed the random number generator. setRandomSeed(); @@ -44,7 +44,7 @@ function CoreModule::onCreate(%this) createCanvas($appName); //load canvas - //exec("./console/main.cs"); + //exec("./console/main." @ $TorqueScriptFileExtension); ModuleDatabase.LoadExplicit( "Core_Console" ); @@ -62,8 +62,8 @@ function CoreModule::onCreate(%this) // If we have editors, initialize them here as well if (isToolBuild()) { - if(isFile("tools/main.cs") && !$isDedicated) - exec("tools/main.cs"); + if(isFile("tools/main." @ $TorqueScriptFileExtension) && !$isDedicated) + exec("tools/main." @ $TorqueScriptFileExtension); } //This is used to build the remap keybind sets for the different actionMaps. diff --git a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module index 76b956a88..ec72cbc70 100644 --- a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module +++ b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.module @@ -2,7 +2,7 @@ ModuleId="Core_ClientServer" VersionId="1" Description="Default module for the game." - ScriptFile="Core_ClientServer.cs" + ScriptFile="Core_ClientServer" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript similarity index 88% rename from Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs rename to Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript index 578db7523..60a3705de 100644 --- a/Templates/BaseGame/game/core/clientServer/Core_ClientServer.cs +++ b/Templates/BaseGame/game/core/clientServer/Core_ClientServer.tscript @@ -15,8 +15,8 @@ function Core_ClientServer::onCreate( %this ) { echo("\n--------- Initializing Directory: scripts ---------"); - exec( "./scripts/client/client.cs" ); - exec( "./scripts/server/server.cs" ); + exec( "./scripts/client/client." @ $TorqueScriptFileExtension ); + exec( "./scripts/server/server." @ $TorqueScriptFileExtension ); $Game::MainScene = getScene(0); @@ -52,11 +52,11 @@ function Core_ClientServer::onDestroy( %this ) echo("Exporting client prefs"); %prefPath = getPrefpath(); - export("$pref::*", %prefPath @ "/clientPrefs.cs", false); + export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); echo("Exporting server prefs"); - export("$Pref::Server::*", %prefPath @ "/serverPrefs.cs", false); - BanList::Export(%prefPath @ "/banlist.cs"); + export("$Pref::Server::*", %prefPath @ "/serverPrefs." @ $TorqueScriptFileExtension, false); + BanList::Export(%prefPath @ "/banlist." @ $TorqueScriptFileExtension); } //----------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/client.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/client.tscript similarity index 55% rename from Templates/BaseGame/game/core/clientServer/scripts/client/client.cs rename to Templates/BaseGame/game/core/clientServer/scripts/client/client.tscript index 2105dd074..b583bbc60 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/client/client.cs +++ b/Templates/BaseGame/game/core/clientServer/scripts/client/client.tscript @@ -9,16 +9,16 @@ function initClient() $Client::GameTypeQuery = $appName; $Client::MissionTypeQuery = "Any"; - exec( "./message.cs" ); - exec( "./connectionToServer.cs" ); - exec( "./levelDownload.cs" ); - exec( "./levelLoad.cs" ); + exec( "./message." @ $TorqueScriptFileExtension ); + exec( "./connectionToServer." @ $TorqueScriptFileExtension ); + exec( "./levelDownload." @ $TorqueScriptFileExtension ); + exec( "./levelLoad." @ $TorqueScriptFileExtension ); //load prefs - exec( "data/defaults.cs" ); + exec( "data/defaults." @ $TorqueScriptFileExtension ); %prefPath = getPrefpath(); - if ( isFile( %prefPath @ "/clientPrefs.cs" ) ) - exec( %prefPath @ "/clientPrefs.cs" ); + if ( isFile( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ) ) + exec( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ); callOnModules("initClient"); diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.cs rename to Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.cs rename to Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.cs rename to Templates/BaseGame/game/core/clientServer/scripts/client/levelLoad.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/message.cs b/Templates/BaseGame/game/core/clientServer/scripts/client/message.tscript similarity index 99% rename from Templates/BaseGame/game/core/clientServer/scripts/client/message.cs rename to Templates/BaseGame/game/core/clientServer/scripts/client/message.tscript index c532d50d9..1f5630252 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/client/message.cs +++ b/Templates/BaseGame/game/core/clientServer/scripts/client/message.tscript @@ -25,7 +25,7 @@ // Functions that process commands sent from the server. // Game event descriptions, which may or may not include text messages, can be -// sent using the message* functions in core/scripts/server/message.cs. Those +// sent using the message* functions in core/scripts/server/message.tscript. Those // functions do commandToClient with the tag ServerMessage, which invokes the // function below. diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/audio.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/audio.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/audio.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/audio.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/commands.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/commands.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/commands.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/commands.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/defaults.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/defaults.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/defaults.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/defaults.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/kickban.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/kickban.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/kickban.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/kickban.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelDownload.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelInfo.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/message.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/message.tscript similarity index 100% rename from Templates/BaseGame/game/core/clientServer/scripts/server/message.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/message.tscript diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/server.cs b/Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript similarity index 91% rename from Templates/BaseGame/game/core/clientServer/scripts/server/server.cs rename to Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript index c4d8050a1..9d65ade2d 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/server/server.cs +++ b/Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript @@ -27,21 +27,21 @@ function initServer() //load prefs //Force-load the defaults just so we don't have any mistakes - exec( "./defaults.cs" ); + exec( "./defaults." @ $TorqueScriptFileExtension ); //Then, if the user has saved preferences, we load those over-top the defaults %prefPath = getPrefpath(); - if ( isFile( %prefPath @ "/serverPrefs.cs" ) ) - exec( %prefPath @ "/serverPrefs.cs" ); + if ( isFile( %prefPath @ "/serverPrefs." @ $TorqueScriptFileExtension ) ) + exec( %prefPath @ "/serverPrefs." @ $TorqueScriptFileExtension ); - exec( "./audio.cs" ); - exec( "./commands.cs" ); - exec( "./kickban.cs" ); - exec( "./message.cs" ); - exec( "./levelDownload.cs" ); - exec( "./levelLoad.cs" ); - exec( "./levelInfo.cs" ); - exec( "./connectionToClient.cs" ); + exec( "./audio." @ $TorqueScriptFileExtension ); + exec( "./commands." @ $TorqueScriptFileExtension ); + exec( "./kickban." @ $TorqueScriptFileExtension ); + exec( "./message." @ $TorqueScriptFileExtension ); + exec( "./levelDownload." @ $TorqueScriptFileExtension ); + exec( "./levelLoad." @ $TorqueScriptFileExtension ); + exec( "./levelInfo." @ $TorqueScriptFileExtension ); + exec( "./connectionToClient." @ $TorqueScriptFileExtension ); // Server::Status is returned in the Game Info Query and represents the // current status of the server. This string sould be very short. @@ -250,9 +250,9 @@ function destroyServer() // Save any server settings %prefPath = getPrefpath(); echo( "Exporting server prefs..." ); - export( "$Pref::Server::*", %prefPath@"/serverPrefs.cs", false ); + export( "$Pref::Server::*", %prefPath@"/serverPrefs." @ $TorqueScriptFileExtension, false ); - BanList::Export(%prefPath@"/banlist.cs"); + BanList::Export(%prefPath@"/banlist." @ $TorqueScriptFileExtension); // Increase the server session number. This is used to make sure we're // working with the server session we think we are. diff --git a/Templates/BaseGame/game/core/console/Core_Console.cs b/Templates/BaseGame/game/core/console/Core_Console.cs deleted file mode 100644 index a93b149f4..000000000 --- a/Templates/BaseGame/game/core/console/Core_Console.cs +++ /dev/null @@ -1,12 +0,0 @@ - -function Core_Console::onCreate(%this) -{ - exec("./scripts/profiles.cs"); - exec("./scripts/console.cs"); - - exec("./guis/console.gui"); -} - -function Core_Console::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/console/Core_Console.module b/Templates/BaseGame/game/core/console/Core_Console.module index 6927ba40e..62839d63a 100644 --- a/Templates/BaseGame/game/core/console/Core_Console.module +++ b/Templates/BaseGame/game/core/console/Core_Console.module @@ -2,7 +2,7 @@ ModuleId="Core_Console" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_Console.cs" + ScriptFile="Core_Console" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core" diff --git a/Templates/BaseGame/game/core/console/Core_Console.tscript b/Templates/BaseGame/game/core/console/Core_Console.tscript new file mode 100644 index 000000000..76b3f1296 --- /dev/null +++ b/Templates/BaseGame/game/core/console/Core_Console.tscript @@ -0,0 +1,12 @@ + +function Core_Console::onCreate(%this) +{ + exec("./scripts/profiles." @ $TorqueScriptFileExtension); + exec("./scripts/console." @ $TorqueScriptFileExtension); + + exec("./guis/console.gui"); +} + +function Core_Console::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/console/scripts/console.cs b/Templates/BaseGame/game/core/console/scripts/console.tscript similarity index 100% rename from Templates/BaseGame/game/core/console/scripts/console.cs rename to Templates/BaseGame/game/core/console/scripts/console.tscript diff --git a/Templates/BaseGame/game/core/console/scripts/profiles.cs b/Templates/BaseGame/game/core/console/scripts/profiles.tscript similarity index 100% rename from Templates/BaseGame/game/core/console/scripts/profiles.cs rename to Templates/BaseGame/game/core/console/scripts/profiles.tscript diff --git a/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.module b/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.module index 87ba2231f..5f891be1f 100644 --- a/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.module +++ b/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.module @@ -2,7 +2,7 @@ ModuleId="Core_GameObjects" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_GameObjects.cs" + ScriptFile="Core_GameObjects" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.cs b/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.tscript similarity index 82% rename from Templates/BaseGame/game/core/gameObjects/Core_GameObjects.cs rename to Templates/BaseGame/game/core/gameObjects/Core_GameObjects.tscript index c62131e0f..2314dc43d 100644 --- a/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.cs +++ b/Templates/BaseGame/game/core/gameObjects/Core_GameObjects.tscript @@ -12,7 +12,7 @@ function Core_GameObjects::initServer( %this ) function Core_GameObjects::onCreateGameServer(%this) { - %this.registerDatablock("./datablocks/defaultDatablocks.cs"); + %this.registerDatablock("./datablocks/defaultDatablocks." @ $TorqueScriptFileExtension); } function Core_GameObjects::onDestroyGameServer(%this) diff --git a/Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.cs b/Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.tscript similarity index 100% rename from Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.cs rename to Templates/BaseGame/game/core/gameObjects/datablocks/defaultDatablocks.tscript diff --git a/Templates/BaseGame/game/core/gameObjects/materials/materials.cs b/Templates/BaseGame/game/core/gameObjects/materials/materials.tscript similarity index 100% rename from Templates/BaseGame/game/core/gameObjects/materials/materials.cs rename to Templates/BaseGame/game/core/gameObjects/materials/materials.tscript diff --git a/Templates/BaseGame/game/core/gameObjects/shapes/materials.cs b/Templates/BaseGame/game/core/gameObjects/shapes/materials.tscript similarity index 100% rename from Templates/BaseGame/game/core/gameObjects/shapes/materials.cs rename to Templates/BaseGame/game/core/gameObjects/shapes/materials.tscript diff --git a/Templates/BaseGame/game/core/gui/Core_GUI.cs b/Templates/BaseGame/game/core/gui/Core_GUI.cs deleted file mode 100644 index dd15bf9ca..000000000 --- a/Templates/BaseGame/game/core/gui/Core_GUI.cs +++ /dev/null @@ -1,11 +0,0 @@ - -function Core_GUI::onCreate(%this) -{ - exec("./scripts/profiles.cs"); - exec("./scripts/canvas.cs"); - exec("./scripts/cursor.cs"); -} - -function Core_GUI::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/gui/Core_GUI.module b/Templates/BaseGame/game/core/gui/Core_GUI.module index 323d7cff2..3e66cdc1a 100644 --- a/Templates/BaseGame/game/core/gui/Core_GUI.module +++ b/Templates/BaseGame/game/core/gui/Core_GUI.module @@ -2,7 +2,7 @@ ModuleId="Core_GUI" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_GUI.cs" + ScriptFile="Core_GUI" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core" diff --git a/Templates/BaseGame/game/core/gui/Core_GUI.tscript b/Templates/BaseGame/game/core/gui/Core_GUI.tscript new file mode 100644 index 000000000..8c086a8cc --- /dev/null +++ b/Templates/BaseGame/game/core/gui/Core_GUI.tscript @@ -0,0 +1,11 @@ + +function Core_GUI::onCreate(%this) +{ + exec("./scripts/profiles." @ $TorqueScriptFileExtension); + exec("./scripts/canvas." @ $TorqueScriptFileExtension); + exec("./scripts/cursor." @ $TorqueScriptFileExtension); +} + +function Core_GUI::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/gui/scripts/canvas.cs b/Templates/BaseGame/game/core/gui/scripts/canvas.tscript similarity index 100% rename from Templates/BaseGame/game/core/gui/scripts/canvas.cs rename to Templates/BaseGame/game/core/gui/scripts/canvas.tscript diff --git a/Templates/BaseGame/game/core/gui/scripts/cursor.cs b/Templates/BaseGame/game/core/gui/scripts/cursor.tscript similarity index 100% rename from Templates/BaseGame/game/core/gui/scripts/cursor.cs rename to Templates/BaseGame/game/core/gui/scripts/cursor.tscript diff --git a/Templates/BaseGame/game/core/gui/scripts/profiles.cs b/Templates/BaseGame/game/core/gui/scripts/profiles.tscript similarity index 100% rename from Templates/BaseGame/game/core/gui/scripts/profiles.cs rename to Templates/BaseGame/game/core/gui/scripts/profiles.tscript diff --git a/Templates/BaseGame/game/core/lighting/Core_Lighting.cs b/Templates/BaseGame/game/core/lighting/Core_Lighting.cs deleted file mode 100644 index dc5680b84..000000000 --- a/Templates/BaseGame/game/core/lighting/Core_Lighting.cs +++ /dev/null @@ -1,20 +0,0 @@ - -function Core_Lighting::onCreate(%this) -{ - exec("./scripts/lighting.cs"); - - //Advanced/Deferred - exec("./scripts/advancedLighting_Shaders.cs"); - exec("./scripts/deferredShading.cs"); - exec("./scripts/advancedLighting_Init.cs"); - - //Basic/Forward - exec("./scripts/basicLighting_shadowFilter.cs"); - exec("./scripts/shadowMaps_Init.cs"); - exec("./scripts/basicLighting_Init.cs"); - -} - -function Core_Lighting::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/lighting/Core_Lighting.module b/Templates/BaseGame/game/core/lighting/Core_Lighting.module index b4619a64a..f2757dfe3 100644 --- a/Templates/BaseGame/game/core/lighting/Core_Lighting.module +++ b/Templates/BaseGame/game/core/lighting/Core_Lighting.module @@ -2,7 +2,7 @@ ModuleId="Core_Lighting" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_Lighting.cs" + ScriptFile="Core_Lighting" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/lighting/Core_Lighting.tscript b/Templates/BaseGame/game/core/lighting/Core_Lighting.tscript new file mode 100644 index 000000000..be8490dfe --- /dev/null +++ b/Templates/BaseGame/game/core/lighting/Core_Lighting.tscript @@ -0,0 +1,20 @@ + +function Core_Lighting::onCreate(%this) +{ + exec("./scripts/lighting." @ $TorqueScriptFileExtension); + + //Advanced/Deferred + exec("./scripts/advancedLighting_Shaders." @ $TorqueScriptFileExtension); + exec("./scripts/deferredShading." @ $TorqueScriptFileExtension); + exec("./scripts/advancedLighting_Init." @ $TorqueScriptFileExtension); + + //Basic/Forward + exec("./scripts/basicLighting_shadowFilter." @ $TorqueScriptFileExtension); + exec("./scripts/shadowMaps_Init." @ $TorqueScriptFileExtension); + exec("./scripts/basicLighting_Init." @ $TorqueScriptFileExtension); + +} + +function Core_Lighting::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.tscript similarity index 95% rename from Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs rename to Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.tscript index b34da6d84..3b427a6f1 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.tscript @@ -39,8 +39,8 @@ $pref::LightManager::sgUseDynamicShadows = "1"; $pref::LightManager::sgUseToneMapping = ""; */ -//exec( "./shaders.cs" ); -//exec( "./deferredShading.cs" ); +//exec( "./shaders." @ $TorqueScriptFileExtension ); +//exec( "./deferredShading." @ $TorqueScriptFileExtension ); function onActivateAdvancedLM() { diff --git a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.tscript similarity index 100% rename from Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs rename to Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.tscript diff --git a/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.tscript similarity index 98% rename from Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs rename to Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.tscript index ef50d670e..88d8f7f53 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_Init.tscript @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -//exec( "./shadowFilter.cs" ); +//exec( "./shadowFilter." @ $TorqueScriptFileExtension ); singleton GFXStateBlockData( BL_ProjectedShadowSBData ) { diff --git a/Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.cs b/Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.tscript similarity index 100% rename from Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.cs rename to Templates/BaseGame/game/core/lighting/scripts/basicLighting_shadowFilter.tscript diff --git a/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs b/Templates/BaseGame/game/core/lighting/scripts/deferredShading.tscript similarity index 100% rename from Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs rename to Templates/BaseGame/game/core/lighting/scripts/deferredShading.tscript diff --git a/Templates/BaseGame/game/core/lighting/scripts/lighting.cs b/Templates/BaseGame/game/core/lighting/scripts/lighting.tscript similarity index 95% rename from Templates/BaseGame/game/core/lighting/scripts/lighting.cs rename to Templates/BaseGame/game/core/lighting/scripts/lighting.tscript index cc64f664b..6bcfd18ae 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/lighting.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/lighting.tscript @@ -26,12 +26,12 @@ function initLightingSystems(%manager) // First exec the scripts for the different light managers // in the lighting folder. - /*%pattern = "./lighting/*//*init.cs"; + /*%pattern = "./lighting/*//*init." @ $TorqueScriptFileExtension; %file = findFirstFile( %pattern ); if ( %file $= "" ) { // Try for DSOs next. - %pattern = "./lighting/*//*init.cs.dso"; + %pattern = "./lighting/*//*init." @ $TorqueScriptFileExtension @ ".dso"; %file = findFirstFile( %pattern ); } diff --git a/Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.cs b/Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.tscript similarity index 100% rename from Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.cs rename to Templates/BaseGame/game/core/lighting/scripts/shadowMaps_Init.tscript diff --git a/Templates/BaseGame/game/core/postFX/Core_PostFX.cs b/Templates/BaseGame/game/core/postFX/Core_PostFX.cs deleted file mode 100644 index 591025819..000000000 --- a/Templates/BaseGame/game/core/postFX/Core_PostFX.cs +++ /dev/null @@ -1,14 +0,0 @@ - -function Core_PostFX::onCreate(%this) -{ - // - exec("./scripts/postFxManager.cs"); - exec("./scripts/postFx.cs"); - - //Load the default config - loadPresetHandler("./scripts/default.postfxpreset.cs"); -} - -function Core_PostFX::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/postFX/Core_PostFX.module b/Templates/BaseGame/game/core/postFX/Core_PostFX.module index 627a32d94..95c45ecc2 100644 --- a/Templates/BaseGame/game/core/postFX/Core_PostFX.module +++ b/Templates/BaseGame/game/core/postFX/Core_PostFX.module @@ -2,7 +2,7 @@ ModuleId="Core_PostFX" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_PostFX.cs" + ScriptFile="Core_PostFX" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core" diff --git a/Templates/BaseGame/game/core/postFX/Core_PostFX.tscript b/Templates/BaseGame/game/core/postFX/Core_PostFX.tscript new file mode 100644 index 000000000..cb61d9274 --- /dev/null +++ b/Templates/BaseGame/game/core/postFX/Core_PostFX.tscript @@ -0,0 +1,14 @@ + +function Core_PostFX::onCreate(%this) +{ + // + exec("./scripts/postFxManager." @ $TorqueScriptFileExtension); + exec("./scripts/postFx." @ $TorqueScriptFileExtension); + + //Load the default config + loadPresetHandler("./scripts/default.postfxpreset." @ $TorqueScriptFileExtension); +} + +function Core_PostFX::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/postFX/images/materials.cs b/Templates/BaseGame/game/core/postFX/images/materials.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/images/materials.cs rename to Templates/BaseGame/game/core/postFX/images/materials.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/CameraMotionBlur/CameraMotionBlurPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/CameraMotionBlur/CameraMotionBlurPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/CameraMotionBlur/CameraMotionBlurPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/CameraMotionBlur/CameraMotionBlurPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/ChromaticAberration/ChromaticAberrationPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/ChromaticAberration/ChromaticAberrationPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/ChromaticAberration/ChromaticAberrationPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/ChromaticAberration/ChromaticAberrationPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.tscript similarity index 99% rename from Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.tscript index 8072ffc4a..29e1bb117 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.cs +++ b/Templates/BaseGame/game/core/postFX/scripts/DepthOfField/DepthOfFieldPostFX.tscript @@ -581,7 +581,7 @@ function DepthOfFieldPostFX::autoFocus( %this ) /* function reloadDOF() { - exec( "./dof.cs" ); + exec( "./dof." @ $TorqueScriptFileExtension ); DepthOfFieldPostFX.reload(); DepthOfFieldPostFX.disable(); DepthOfFieldPostFX.enable(); diff --git a/Templates/BaseGame/game/core/postFX/scripts/EdgeDetect/edgeAAPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/EdgeDetect/edgeAAPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/EdgeDetect/edgeAAPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/EdgeDetect/edgeAAPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/FXAA/FXAAPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/FXAA/FXAAPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/FXAA/FXAAPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/FXAA/FXAAPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Flash/flashPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Flash/flashPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Flash/flashPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Flash/flashPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Fog/fogPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Fog/fogPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Fog/fogPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Fog/fogPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Gamma/GammaPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Gamma/GammaPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Gamma/GammaPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Gamma/GammaPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Glow/GlowPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Glow/GlowPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Glow/GlowPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Glow/GlowPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/HDR/HDRPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/LUTColorGradePostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/LUTColorGradePostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/LUTColorGradePostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/LUTColorGrading/LUTColorGradePostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/LightRays/lightRays.cs b/Templates/BaseGame/game/core/postFX/scripts/LightRays/lightRays.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/LightRays/lightRays.cs rename to Templates/BaseGame/game/core/postFX/scripts/LightRays/lightRays.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.tscript similarity index 98% rename from Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.tscript index 32fb1bd3f..0de83ef53 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.cs +++ b/Templates/BaseGame/game/core/postFX/scripts/MLAA/MLAAPostFX.tscript @@ -27,7 +27,7 @@ // http://www.iryoku.com/mlaa/ // NOTE: This is currently disabled in favor of FXAA. See -// core\scripts\client\canvas.cs if you want to re-enable it. +// core\scripts\client\canvas.tscript if you want to re-enable it. singleton GFXStateBlockData( MLAA_EdgeDetectStateBlock : PFX_DefaultStateBlock ) { diff --git a/Templates/BaseGame/game/core/postFX/scripts/ReflectionProbes/reflectionProbeArrayPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/ReflectionProbes/reflectionProbeArrayPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/ReflectionProbes/reflectionProbeArrayPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/ReflectionProbes/reflectionProbeArrayPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.cs b/Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.cs rename to Templates/BaseGame/game/core/postFX/scripts/SSAO/SSAOPostFx.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Sharpen/SharpenPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Sharpen/SharpenPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Sharpen/SharpenPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Sharpen/SharpenPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Turbulence/TurbulencePostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Turbulence/TurbulencePostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Turbulence/TurbulencePostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Turbulence/TurbulencePostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/UnderwaterFog/underWaterFogPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/UnderwaterFog/underWaterFogPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/UnderwaterFog/underWaterFogPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/UnderwaterFog/underWaterFogPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/VR/ovrBarrelDistortionPostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/VR/ovrBarrelDistortionPostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/VR/ovrBarrelDistortionPostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/VR/ovrBarrelDistortionPostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/Vignette/VignettePostFX.cs b/Templates/BaseGame/game/core/postFX/scripts/Vignette/VignettePostFX.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/Vignette/VignettePostFX.cs rename to Templates/BaseGame/game/core/postFX/scripts/Vignette/VignettePostFX.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs b/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs rename to Templates/BaseGame/game/core/postFX/scripts/afxHighlight.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.cs b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript similarity index 100% rename from Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.cs rename to Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript diff --git a/Templates/BaseGame/game/core/postFX/scripts/postFx.cs b/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript similarity index 95% rename from Templates/BaseGame/game/core/postFX/scripts/postFx.cs rename to Templates/BaseGame/game/core/postFX/scripts/postFx.tscript index 2d92a7ea7..cbea8fe1f 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/postFx.cs +++ b/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript @@ -39,12 +39,12 @@ function postFXInit() if (!$Server::Dedicated) { //init the postFX - %pattern = "./*.cs"; + %pattern = "./*." @ $TorqueScriptFileExtension; %file = findFirstFile( %pattern ); if ( %file $= "" ) { // Try for DSOs next. - %pattern = "core/postFX/*.cs.dso"; + %pattern = "core/postFX/*." @ $TorqueScriptFileExtension @ ".dso"; %file = findFirstFile( %pattern ); } diff --git a/Templates/BaseGame/game/core/postFX/scripts/postFxManager.cs b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript similarity index 97% rename from Templates/BaseGame/game/core/postFX/scripts/postFxManager.cs rename to Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript index f7f5dad59..cf0080923 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/postFxManager.cs +++ b/Templates/BaseGame/game/core/postFX/scripts/postFxManager.tscript @@ -40,15 +40,15 @@ function PostFXManager::registerPostEffect(%this, %postEffect) } // Used to name the saved files. -$PostFXManager::fileExtension = ".postfxpreset.cs"; +$PostFXManager::fileExtension = ".postfxpreset." @ $TorqueScriptFileExtension; // The filter string for file open/save dialogs. -$PostFXManager::fileFilter = "Post Effect Presets|*.postfxpreset.cs"; +$PostFXManager::fileFilter = "Post Effect Presets|*.postfxpreset." @ $TorqueScriptFileExtension; // Enable / disable PostFX when loading presets or just apply the settings? $PostFXManager::forceEnableFromPresets = true; -$PostFXManager::defaultPreset = "core/postFX/scripts/default.postfxpreset.cs"; +$PostFXManager::defaultPreset = "core/postFX/scripts/default.postfxpreset." @ $TorqueScriptFileExtension; $PostFXManager::currentPreset = ""; diff --git a/Templates/BaseGame/game/core/rendering/Core_Rendering.module b/Templates/BaseGame/game/core/rendering/Core_Rendering.module index f8fb416e7..d43e38b20 100644 --- a/Templates/BaseGame/game/core/rendering/Core_Rendering.module +++ b/Templates/BaseGame/game/core/rendering/Core_Rendering.module @@ -2,7 +2,7 @@ ModuleId="Core_Rendering" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_Rendering.cs" + ScriptFile="Core_Rendering" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/rendering/Core_Rendering.cs b/Templates/BaseGame/game/core/rendering/Core_Rendering.tscript similarity index 70% rename from Templates/BaseGame/game/core/rendering/Core_Rendering.cs rename to Templates/BaseGame/game/core/rendering/Core_Rendering.tscript index 805331463..ab67dfccb 100644 --- a/Templates/BaseGame/game/core/rendering/Core_Rendering.cs +++ b/Templates/BaseGame/game/core/rendering/Core_Rendering.tscript @@ -25,18 +25,16 @@ function Core_Rendering::onCreate(%this) $Terrain::NormalTextureFormat = ProjectSettings.value("Terrain/NormalTextureFormat", 12); $Terrain::OrmTextureFormat = ProjectSettings.value("Terrain/OrmTextureFormat", 12); - exec("./scripts/graphicsOptions.cs"); - exec("./scripts/terrainSettings.cs"); - exec("./scripts/renderManager.cs"); - exec("./scripts/gfxData/clouds.cs"); - exec("./scripts/gfxData/commonMaterialData.cs"); - exec("./scripts/gfxData/scatterSky.cs"); - exec("./scripts/gfxData/shaders.cs"); - exec("./scripts/gfxData/terrainBlock.cs"); - exec("./scripts/gfxData/water.cs"); - exec("./scripts/gfxData/warningTerrainMat.cs"); - - loadTerrainSettings(); + exec("./scripts/graphicsOptions." @ $TorqueScriptFileExtension); + exec("./scripts/terrainSettings." @ $TorqueScriptFileExtension); + exec("./scripts/renderManager." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/clouds." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/commonMaterialData." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/scatterSky." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/shaders." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/terrainBlock." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/water." @ $TorqueScriptFileExtension); + exec("./scripts/gfxData/warningTerrainMat." @ $TorqueScriptFileExtension); } function Core_Rendering::onDestroy(%this) @@ -50,10 +48,10 @@ function Core_Rendering::initClient(%this) initLightingSystems("Advanced Lighting"); //load prefs - exec("data/defaults.cs"); + exec("data/defaults." @ $TorqueScriptFileExtension); %prefPath = getPrefpath(); - if ( isFile( %prefPath @ "/clientPrefs.cs" ) ) - exec( %prefPath @ "/clientPrefs.cs" ); + if ( isFile( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ) ) + exec( %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension ); configureCanvas(); diff --git a/Templates/BaseGame/game/core/rendering/images/materials.cs b/Templates/BaseGame/game/core/rendering/images/materials.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/images/materials.cs rename to Templates/BaseGame/game/core/rendering/images/materials.tscript diff --git a/Templates/BaseGame/game/core/rendering/materials/NoMaterial.cs b/Templates/BaseGame/game/core/rendering/materials/NoMaterial.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/materials/NoMaterial.cs rename to Templates/BaseGame/game/core/rendering/materials/NoMaterial.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/clouds.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/commonMaterialData.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/scatterSky.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/shaders.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/terrainBlock.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/warningTerrainMat.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/warningTerrainMat.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/warningTerrainMat.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/warningTerrainMat.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxData/water.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxData/water.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxData/water.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxData/water.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.ATITechnologiesInc.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.GeForce8600.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.QuadroFXGo1000.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.NVIDIA.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.cs b/Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.cs rename to Templates/BaseGame/game/core/rendering/scripts/gfxprofile/D3D9.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.cs b/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.cs rename to Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript diff --git a/Templates/BaseGame/game/core/rendering/scripts/renderManager.cs b/Templates/BaseGame/game/core/rendering/scripts/renderManager.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/scripts/renderManager.cs rename to Templates/BaseGame/game/core/rendering/scripts/renderManager.tscript diff --git a/Templates/BaseGame/game/core/rendering/shapes/materials.cs b/Templates/BaseGame/game/core/rendering/shapes/materials.tscript similarity index 100% rename from Templates/BaseGame/game/core/rendering/shapes/materials.cs rename to Templates/BaseGame/game/core/rendering/shapes/materials.tscript diff --git a/Templates/BaseGame/game/core/sfx/Core_SFX.cs b/Templates/BaseGame/game/core/sfx/Core_SFX.cs deleted file mode 100644 index acd5c6e08..000000000 --- a/Templates/BaseGame/game/core/sfx/Core_SFX.cs +++ /dev/null @@ -1,15 +0,0 @@ - -function Core_SFX::onCreate(%this) -{ - exec("./scripts/audio.cs"); - exec("./scripts/audioData.cs"); - exec("./scripts/audioAmbience.cs"); - exec("./scripts/audioDescriptions.cs"); - exec("./scripts/audioEnvironments.cs"); - exec("./scripts/audioStates.cs"); - -} - -function Core_SFX::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/sfx/Core_SFX.module b/Templates/BaseGame/game/core/sfx/Core_SFX.module index 855fe2a11..e76ed3fcb 100644 --- a/Templates/BaseGame/game/core/sfx/Core_SFX.module +++ b/Templates/BaseGame/game/core/sfx/Core_SFX.module @@ -2,7 +2,7 @@ ModuleId="Core_SFX" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_SFX.cs" + ScriptFile="Core_SFX" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/sfx/Core_SFX.tscript b/Templates/BaseGame/game/core/sfx/Core_SFX.tscript new file mode 100644 index 000000000..f0babb90f --- /dev/null +++ b/Templates/BaseGame/game/core/sfx/Core_SFX.tscript @@ -0,0 +1,15 @@ + +function Core_SFX::onCreate(%this) +{ + exec("./scripts/audio." @ $TorqueScriptFileExtension); + exec("./scripts/audioData." @ $TorqueScriptFileExtension); + exec("./scripts/audioAmbience." @ $TorqueScriptFileExtension); + exec("./scripts/audioDescriptions." @ $TorqueScriptFileExtension); + exec("./scripts/audioEnvironments." @ $TorqueScriptFileExtension); + exec("./scripts/audioStates." @ $TorqueScriptFileExtension); + +} + +function Core_SFX::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/sfx/scripts/audio.cs b/Templates/BaseGame/game/core/sfx/scripts/audio.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audio.cs rename to Templates/BaseGame/game/core/sfx/scripts/audio.tscript diff --git a/Templates/BaseGame/game/core/sfx/scripts/audioAmbience.cs b/Templates/BaseGame/game/core/sfx/scripts/audioAmbience.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audioAmbience.cs rename to Templates/BaseGame/game/core/sfx/scripts/audioAmbience.tscript diff --git a/Templates/BaseGame/game/core/sfx/scripts/audioData.cs b/Templates/BaseGame/game/core/sfx/scripts/audioData.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audioData.cs rename to Templates/BaseGame/game/core/sfx/scripts/audioData.tscript diff --git a/Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.cs b/Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.cs rename to Templates/BaseGame/game/core/sfx/scripts/audioDescriptions.tscript diff --git a/Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.cs b/Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.cs rename to Templates/BaseGame/game/core/sfx/scripts/audioEnvironments.tscript diff --git a/Templates/BaseGame/game/core/sfx/scripts/audioStates.cs b/Templates/BaseGame/game/core/sfx/scripts/audioStates.tscript similarity index 100% rename from Templates/BaseGame/game/core/sfx/scripts/audioStates.cs rename to Templates/BaseGame/game/core/sfx/scripts/audioStates.tscript diff --git a/Templates/BaseGame/game/core/utility/Core_Utility.cs b/Templates/BaseGame/game/core/utility/Core_Utility.cs deleted file mode 100644 index 99af9d7b5..000000000 --- a/Templates/BaseGame/game/core/utility/Core_Utility.cs +++ /dev/null @@ -1,16 +0,0 @@ - -function Core_Utility::onCreate(%this) -{ - exec("./scripts/parseArgs.cs"); - exec("./scripts/globals.cs"); - exec("./scripts/helperFunctions.cs"); - exec("./scripts/gameObjectManagement.cs"); - exec("./scripts/persistanceManagement.cs"); - exec("./scripts/module.cs"); - exec("./scripts/scene.cs"); - exec("./scripts/input.cs"); -} - -function Core_Utility::onDestroy(%this) -{ -} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/utility/Core_Utility.module b/Templates/BaseGame/game/core/utility/Core_Utility.module index cb6539040..2baba2fa3 100644 --- a/Templates/BaseGame/game/core/utility/Core_Utility.module +++ b/Templates/BaseGame/game/core/utility/Core_Utility.module @@ -2,7 +2,7 @@ ModuleId="Core_Utility" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="Core_Utility.cs" + ScriptFile="Core_Utility" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Core"> diff --git a/Templates/BaseGame/game/core/utility/Core_Utility.tscript b/Templates/BaseGame/game/core/utility/Core_Utility.tscript new file mode 100644 index 000000000..02dbc975b --- /dev/null +++ b/Templates/BaseGame/game/core/utility/Core_Utility.tscript @@ -0,0 +1,16 @@ + +function Core_Utility::onCreate(%this) +{ + exec("./scripts/parseArgs." @ $TorqueScriptFileExtension); + exec("./scripts/globals." @ $TorqueScriptFileExtension); + exec("./scripts/helperFunctions." @ $TorqueScriptFileExtension); + exec("./scripts/gameObjectManagement." @ $TorqueScriptFileExtension); + exec("./scripts/persistanceManagement." @ $TorqueScriptFileExtension); + exec("./scripts/module." @ $TorqueScriptFileExtension); + exec("./scripts/scene." @ $TorqueScriptFileExtension); + exec("./scripts/input." @ $TorqueScriptFileExtension); +} + +function Core_Utility::onDestroy(%this) +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.cs b/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript similarity index 100% rename from Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.cs rename to Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript diff --git a/Templates/BaseGame/game/core/utility/scripts/globals.cs b/Templates/BaseGame/game/core/utility/scripts/globals.tscript similarity index 100% rename from Templates/BaseGame/game/core/utility/scripts/globals.cs rename to Templates/BaseGame/game/core/utility/scripts/globals.tscript diff --git a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript similarity index 95% rename from Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs rename to Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript index 8f61eceb7..6da8298e7 100644 --- a/Templates/BaseGame/game/core/utility/scripts/helperFunctions.cs +++ b/Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript @@ -39,9 +39,9 @@ function loadMaterials() // the folder exists if( IsDirectory( "materialEditor" ) ) { - for( %file = findFirstFile( "materialEditor/*.cs.dso" ); + for( %file = findFirstFile( "materialEditor/*." @ $TorqueScriptFileExtension @ ".dso" ); %file !$= ""; - %file = findNextFile( "materialEditor/*.cs.dso" )) + %file = findNextFile( "materialEditor/*." @ $TorqueScriptFileExtension @ ".dso" )) { // Only execute, if we don't have the source file. %csFileName = getSubStr( %file, 0, strlen( %file ) - 4 ); @@ -49,9 +49,9 @@ function loadMaterials() exec( %csFileName ); } - for( %file = findFirstFile( "materialEditor/*.cs" ); + for( %file = findFirstFile( "materialEditor/*." @ $TorqueScriptFileExtension ); %file !$= ""; - %file = findNextFile( "materialEditor/*.cs" )) + %file = findNextFile( "materialEditor/*." @ $TorqueScriptFileExtension )) { exec( %file ); } @@ -477,11 +477,11 @@ function compileFiles(%pattern) $Scripts::OverrideDSOPath = %path; $Scripts::ignoreDSOs = false; - %mainCsFile = makeFullPath("main.cs"); + %mainCsFile = makeFullPath("main." @ $TorqueScriptFileExtension); for (%file = findFirstFileMultiExpr(%pattern); %file !$= ""; %file = findNextFileMultiExpr(%pattern)) { - // we don't want to try and compile the primary main.cs + // we don't want to try and compile the primary main if(%mainCsFile !$= %file) compile(%file, true); } @@ -502,7 +502,7 @@ function displayHelp() error( "Torque Demo command line options:\n"@ - " -log Logging behavior; see main.cs comments for details\n"@ + " -log Logging behavior; see main." @ $TorqueScriptFileExtension @ " comments for details\n"@ " -game Reset list of mods to only contain \n"@ " Works like the -game argument\n"@ " -dir Add to list of directories\n"@ @@ -518,8 +518,8 @@ function loadDir(%dir) { pushback($userDirs, %dir, ";"); - if (isScriptFile(%dir @ "/main.cs")) - exec(%dir @ "/main.cs"); + if (isScriptFile(%dir @ "/main." @ $TorqueScriptFileExtension)) + exec(%dir @ "/main." @ $TorqueScriptFileExtension); } function loadDirs(%dirPath) @@ -528,7 +528,7 @@ function loadDirs(%dirPath) if (%dirPath !$= "") loadDirs(%dirPath); - if(exec(%token @ "/main.cs") != true) + if(exec(%token @ "/main." @ $TorqueScriptFileExtension) != true) { error("Error: Unable to find specified directory: " @ %token ); $dirCount--; diff --git a/Templates/BaseGame/game/core/utility/scripts/input.cs b/Templates/BaseGame/game/core/utility/scripts/input.tscript similarity index 100% rename from Templates/BaseGame/game/core/utility/scripts/input.cs rename to Templates/BaseGame/game/core/utility/scripts/input.tscript diff --git a/Templates/BaseGame/game/core/utility/scripts/module.cs b/Templates/BaseGame/game/core/utility/scripts/module.tscript similarity index 88% rename from Templates/BaseGame/game/core/utility/scripts/module.cs rename to Templates/BaseGame/game/core/utility/scripts/module.tscript index dc2e1f1c4..5a8304aaa 100644 --- a/Templates/BaseGame/game/core/utility/scripts/module.cs +++ b/Templates/BaseGame/game/core/utility/scripts/module.tscript @@ -3,9 +3,8 @@ $reportModuleFileConflicts=true; if (!isObject(ExecFilesList)) new ArrayObject(ExecFilesList); -function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3, %var4, %var5, %var6) +function callOnModules(%functionName, %moduleGroup) { - %maxvars = 7; // match this to i/o signature //clear per module group file execution chain ExecFilesList.empty(); //Get our modules so we can exec any specific client-side loading/handling @@ -22,18 +21,7 @@ function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3, if(isObject(%module.scopeSet) && %module.scopeSet.isMethod(%functionName)) { - %stryng = %module.scopeSet @ "." @ %functionName @ "("; - for (%a=0;%a<%maxvars;%a++) - { - if (%var[%a] !$= "") - { - %stryng = %stryng @ %var[%a]; - if (%a<%maxvars-1 && %var[%a+1] !$= "") - %stryng = %stryng @ ","; - } - } - %stryng = %stryng @ ");"; - eval(%stryng); + eval(%module.scopeSet @ "." @ %functionName @ "();"); } } @@ -63,9 +51,9 @@ function loadModuleMaterials(%moduleGroup) // Load any materials files for which we only have DSOs. - for( %file = findFirstFile( %modulePath @ "/*/materials.cs.dso" ); + for( %file = findFirstFile( %modulePath @ "/*/materials." @ $TorqueScriptFileExtension @ ".dso" ); %file !$= ""; - %file = findNextFile( %modulePath @ "/*/materials.cs.dso" )) + %file = findNextFile( %modulePath @ "/*/materials." @ $TorqueScriptFileExtension @ ".dso" )) { // Only execute, if we don't have the source file. %csFileName = getSubStr( %file, 0, strlen( %file ) - 4 ); @@ -75,9 +63,9 @@ function loadModuleMaterials(%moduleGroup) // Load all source material files. - for( %file = findFirstFile( %modulePath @ "/*/materials.cs" ); + for( %file = findFirstFile( %modulePath @ "/*/materials." @ $TorqueScriptFileExtension ); %file !$= ""; - %file = findNextFile( %modulePath @ "/*/materials.cs" )) + %file = findNextFile( %modulePath @ "/*/materials." @ $TorqueScriptFileExtension )) { exec( %file ); } @@ -133,9 +121,9 @@ function SimSet::registerDatablock(%scopeSet, %datablockFilePath, %isExclusive) //allows one to override exclusive with exclusive %locked = DatablockFilesList.getValue(%i); - if ((%locked && !%isExclusive)&&($reportModuleFileConflicts)) + if ((!%locked && !%isExclusive)&&($reportModuleFileConflicts)) error("found" SPC %datablockFilePath SPC "duplicate file!"); - if (%isExclusive) + if (!%locked || (%locked && %isExclusive)) { // Replacing an existing entry, update in-place DatablockFilesList.setKey(%fullPath, %i); DatablockFilesList.setValue(%isExclusive, %i); @@ -233,9 +221,9 @@ function SimSet::queueExec(%scopeSet, %execFilePath, %isExclusive) //do note that doing it in this order means setting exclusive twice //allows one to override exclusive with exclusive %locked = ExecFilesList.getValue(%i); - if ((%locked && !%isExclusive)&&($reportModuleFileConflicts)) + if ((!%locked && !%isExclusive)&&($reportModuleFileConflicts)) error("found" SPC %execFilePath SPC "duplicate file!"); - if (%isExclusive) + if (!%locked || (%locked && %isExclusive)) { // Replacing an existing entry, update in-place ExecFilesList.setKey(%fullPath, %i); ExecFilesList.setValue(%isExclusive, %i); @@ -293,4 +281,4 @@ function SimSet::unQueueExec(%scopeSet, %execFilePath) } if ($traceModuleCalls) ExecFilesList.echo(); -} +} \ No newline at end of file diff --git a/Templates/BaseGame/game/core/utility/scripts/parseArgs.cs b/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript similarity index 99% rename from Templates/BaseGame/game/core/utility/scripts/parseArgs.cs rename to Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript index 811cee00c..51975d635 100644 --- a/Templates/BaseGame/game/core/utility/scripts/parseArgs.cs +++ b/Templates/BaseGame/game/core/utility/scripts/parseArgs.tscript @@ -355,7 +355,7 @@ function parseArgs() %i++; } else - error("Error: Missing Command Line argument. Usage: -prefs "); + error("Error: Missing Command Line argument. Usage: -prefs "); //------------------- diff --git a/Templates/BaseGame/game/core/utility/scripts/persistanceManagement.cs b/Templates/BaseGame/game/core/utility/scripts/persistanceManagement.tscript similarity index 92% rename from Templates/BaseGame/game/core/utility/scripts/persistanceManagement.cs rename to Templates/BaseGame/game/core/utility/scripts/persistanceManagement.tscript index aab054161..90d0a8744 100644 --- a/Templates/BaseGame/game/core/utility/scripts/persistanceManagement.cs +++ b/Templates/BaseGame/game/core/utility/scripts/persistanceManagement.tscript @@ -112,7 +112,7 @@ function TestPManager::testNewObject(%doNotSave) }; // Flag it as dirty - TestPManager.setDirty(AudioNew, "core/scripts/client/audio.cs"); + TestPManager.setDirty(AudioNew, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Test adding a new unnamed object %obj = new SFXDescription() @@ -123,12 +123,12 @@ function TestPManager::testNewObject(%doNotSave) }; // Flag it as dirty - TestPManager.setDirty(%obj, "core/scripts/client/audio.cs"); + TestPManager.setDirty(%obj, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Test adding an "empty" object new SFXDescription(AudioEmpty); - TestPManager.setDirty(AudioEmpty, "core/scripts/client/audio.cs"); + TestPManager.setDirty(AudioEmpty, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Unless %doNotSave is set (by a batch/combo test) // then go ahead and save now @@ -165,7 +165,7 @@ function TestPManager::testNewGroup(%doNotSave) }; // Flag this as dirty - TestPManager.setDirty(TestGroup, "core/scripts/client/audio.cs"); + TestPManager.setDirty(TestGroup, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Test adding a new unnamed SimGroup %group = new SimGroup() @@ -193,7 +193,7 @@ function TestPManager::testNewGroup(%doNotSave) }; // Flag this as dirty - TestPManager.setDirty(%group, "core/scripts/client/audio.cs"); + TestPManager.setDirty(%group, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Test adding a new unnamed SimSet %set = new SimSet() @@ -221,7 +221,7 @@ function TestPManager::testNewGroup(%doNotSave) }; // Flag this as dirty - TestPManager.setDirty(%set, "core/scripts/client/audio.cs"); + TestPManager.setDirty(%set, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Unless %doNotSave is set (by a batch/combo test) // then go ahead and save now @@ -257,7 +257,7 @@ function TestPManager::testMoveObject(%doNotSave) }; // Flag this as dirty - TestPManager.setDirty(MoveGroup1, "core/scripts/client/audio.cs"); + TestPManager.setDirty(MoveGroup1, "core/scripts/client/audio." @ $TorqueScriptFileExtension); new SimGroup(MoveGroup2) { @@ -273,7 +273,7 @@ function TestPManager::testMoveObject(%doNotSave) }; // Flag this as dirty - TestPManager.setDirty(MoveGroup2, "core/scripts/client/audio.cs"); + TestPManager.setDirty(MoveGroup2, "core/scripts/client/audio." @ $TorqueScriptFileExtension); // Unless %doNotSave is set (by a batch/combo test) // then go ahead and save now diff --git a/Templates/BaseGame/game/core/utility/scripts/scene.cs b/Templates/BaseGame/game/core/utility/scripts/scene.tscript similarity index 100% rename from Templates/BaseGame/game/core/utility/scripts/scene.cs rename to Templates/BaseGame/game/core/utility/scripts/scene.tscript diff --git a/Templates/BaseGame/game/core/utility/scripts/signalManager.cs b/Templates/BaseGame/game/core/utility/scripts/signalManager.tscript similarity index 100% rename from Templates/BaseGame/game/core/utility/scripts/signalManager.cs rename to Templates/BaseGame/game/core/utility/scripts/signalManager.tscript diff --git a/Templates/BaseGame/game/data/ExampleModule/ExampleModule.module b/Templates/BaseGame/game/data/ExampleModule/ExampleModule.module index 8680e0483..091b7c55c 100644 --- a/Templates/BaseGame/game/data/ExampleModule/ExampleModule.module +++ b/Templates/BaseGame/game/data/ExampleModule/ExampleModule.module @@ -4,7 +4,7 @@ ModuleId="ExampleModule" VersionId="1" Group="Game" - scriptFile="ExampleModule.cs" + scriptFile="ExampleModule" CreateFunction="onCreate" DestroyFunction="onDestroy"> diff --git a/Templates/BaseGame/game/data/ui/UI.cs b/Templates/BaseGame/game/data/ui/UI.tscript similarity index 63% rename from Templates/BaseGame/game/data/ui/UI.cs rename to Templates/BaseGame/game/data/ui/UI.tscript index 93373b97c..90d408052 100644 --- a/Templates/BaseGame/game/data/ui/UI.cs +++ b/Templates/BaseGame/game/data/ui/UI.tscript @@ -30,55 +30,55 @@ function UI::initClient(%this) { //Load UI stuff //we need to load this because some of the menu profiles use the sounds here - //%this.queueExec("./datablocks/guiSounds.cs"); + //%this.queueExec("./datablocks/guiSounds." @ $TorqueScriptFileExtension); //Profiles - %this.queueExec("./scripts/profiles.cs"); + %this.queueExec("./scripts/profiles." @ $TorqueScriptFileExtension); //Now gui files - %this.queueExec("./scripts/menuInputButtons.cs"); + %this.queueExec("./scripts/menuInputButtons." @ $TorqueScriptFileExtension); - %this.queueExec("./guis/mainMenu.cs"); + %this.queueExec("./guis/mainMenu." @ $TorqueScriptFileExtension); %this.queueExec("./guis/mainMenu.gui"); - %this.queueExec("./guis/chooseLevelDlg.cs"); + %this.queueExec("./guis/chooseLevelDlg." @ $TorqueScriptFileExtension); %this.queueExec("./guis/chooseLevelDlg.gui"); - %this.queueExec("./guis/joinServerMenu.cs"); + %this.queueExec("./guis/joinServerMenu." @ $TorqueScriptFileExtension); %this.queueExec("./guis/joinServerMenu.gui"); %this.queueExec("./guis/loadingGui.gui"); - %this.queueExec("./guis/optionsMenu.cs"); + %this.queueExec("./guis/optionsMenu." @ $TorqueScriptFileExtension); %this.queueExec("./guis/optionsMenu.gui"); - %this.queueExec("./guis/pauseMenu.cs"); + %this.queueExec("./guis/pauseMenu." @ $TorqueScriptFileExtension); %this.queueExec("./guis/pauseMenu.gui"); %this.queueExec("./guis/remapDlg.gui"); %this.queueExec("./guis/remapConfirmDlg.gui"); - %this.queueExec("./guis/profiler.cs"); + %this.queueExec("./guis/profiler." @ $TorqueScriptFileExtension); %this.queueExec("./guis/profiler.gui"); %this.queueExec("./guis/netGraphGui.gui"); %this.queueExec("./guis/RecordingsDlg.gui"); - %this.queueExec("./guis/guiMusicPlayer.cs"); + %this.queueExec("./guis/guiMusicPlayer." @ $TorqueScriptFileExtension); %this.queueExec("./guis/guiMusicPlayer.gui"); - %this.queueExec("./guis/startupGui.cs"); + %this.queueExec("./guis/startupGui." @ $TorqueScriptFileExtension); %this.queueExec("./guis/startupGui.gui"); // Load Editor Dialogs %this.queueExec("./guis/messageBoxDlg.gui"); //Load scripts - %this.queueExec("./scripts/controlsMenu.cs"); - %this.queueExec("./scripts/messageBoxes.cs"); - %this.queueExec("./scripts/help.cs"); - %this.queueExec("./scripts/cursors.cs"); - %this.queueExec("./scripts/utility.cs"); + %this.queueExec("./scripts/controlsMenu." @ $TorqueScriptFileExtension); + %this.queueExec("./scripts/messageBoxes." @ $TorqueScriptFileExtension); + %this.queueExec("./scripts/help." @ $TorqueScriptFileExtension); + %this.queueExec("./scripts/cursors." @ $TorqueScriptFileExtension); + %this.queueExec("./scripts/utility." @ $TorqueScriptFileExtension); } function UI::onCreateClientConnection(%this){} diff --git a/Templates/BaseGame/game/data/ui/datablocks/guiSounds.cs b/Templates/BaseGame/game/data/ui/datablocks/guiSounds.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/datablocks/guiSounds.cs rename to Templates/BaseGame/game/data/ui/datablocks/guiSounds.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.cs b/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.cs rename to Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.cs b/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.cs rename to Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/joinServerMenu.cs b/Templates/BaseGame/game/data/ui/guis/joinServerMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/joinServerMenu.cs rename to Templates/BaseGame/game/data/ui/guis/joinServerMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/mainMenu.gui b/Templates/BaseGame/game/data/ui/guis/mainMenu.gui index 28466b04f..9f4b8ec3b 100644 --- a/Templates/BaseGame/game/data/ui/guis/mainMenu.gui +++ b/Templates/BaseGame/game/data/ui/guis/mainMenu.gui @@ -1,4 +1,4 @@ -exec( "tools/gui/profiles.ed.cs" ); +exec( "tools/gui/profiles.ed.tscript" ); //--- OBJECT WRITE BEGIN --- %guiContent = new GuiChunkedBitmapCtrl(MainMenuGui) { diff --git a/Templates/BaseGame/game/data/ui/guis/mainMenu.cs b/Templates/BaseGame/game/data/ui/guis/mainMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/mainMenu.cs rename to Templates/BaseGame/game/data/ui/guis/mainMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/optionsMenu.cs b/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript similarity index 98% rename from Templates/BaseGame/game/data/ui/guis/optionsMenu.cs rename to Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript index 9fdcbf75f..eba6e173b 100644 --- a/Templates/BaseGame/game/data/ui/guis/optionsMenu.cs +++ b/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript @@ -99,7 +99,7 @@ function OptionsMenu::apply(%this) if(%actionMap == GlobalActionMap.getId()) continue; - %actionMap.save( %prefPath @ "/keybinds.cs", %append ); + %actionMap.save( %prefPath @ "/keybinds." @ $TorqueScriptFileExtension, %append ); if(%append != true) %append = true; @@ -107,7 +107,7 @@ function OptionsMenu::apply(%this) } %prefPath = getPrefpath(); - export("$pref::*", %prefPath @ "/clientPrefs.cs", false); + export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); } function OptionsMenu::resetToDefaults(%this) @@ -290,7 +290,7 @@ function OptionsMenu::applyDisplaySettings(%this) echo("Exporting client prefs"); %prefPath = getPrefpath(); - export("$pref::*", %prefPath @ "/clientPrefs.cs", false); + export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); } function OptionsMenu::populateGraphicsSettingsList(%this) @@ -386,7 +386,7 @@ function OptionsMenu::applyGraphicsSettings(%this) echo("Exporting client prefs"); %prefPath = getPrefpath(); - export("$pref::*", %prefPath @ "/clientPrefs.cs", false); + export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false); } function updateDisplaySettings() diff --git a/Templates/BaseGame/game/data/ui/guis/pauseMenu.cs b/Templates/BaseGame/game/data/ui/guis/pauseMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/pauseMenu.cs rename to Templates/BaseGame/game/data/ui/guis/pauseMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/profiler.cs b/Templates/BaseGame/game/data/ui/guis/profiler.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/profiler.cs rename to Templates/BaseGame/game/data/ui/guis/profiler.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/startupGui.cs b/Templates/BaseGame/game/data/ui/guis/startupGui.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/startupGui.cs rename to Templates/BaseGame/game/data/ui/guis/startupGui.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs b/Templates/BaseGame/game/data/ui/scripts/controlsMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs rename to Templates/BaseGame/game/data/ui/scripts/controlsMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/cursors.cs b/Templates/BaseGame/game/data/ui/scripts/cursors.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/cursors.cs rename to Templates/BaseGame/game/data/ui/scripts/cursors.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.cs b/Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.cs rename to Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/help.cs b/Templates/BaseGame/game/data/ui/scripts/help.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/help.cs rename to Templates/BaseGame/game/data/ui/scripts/help.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs b/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/menuInputButtons.cs rename to Templates/BaseGame/game/data/ui/scripts/menuInputButtons.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs b/Templates/BaseGame/game/data/ui/scripts/messageBoxes.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs rename to Templates/BaseGame/game/data/ui/scripts/messageBoxes.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/profiles.cs b/Templates/BaseGame/game/data/ui/scripts/profiles.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/profiles.cs rename to Templates/BaseGame/game/data/ui/scripts/profiles.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/utility.cs b/Templates/BaseGame/game/data/ui/scripts/utility.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/utility.cs rename to Templates/BaseGame/game/data/ui/scripts/utility.tscript diff --git a/Templates/BaseGame/game/main.cs.in b/Templates/BaseGame/game/main.tscript.in similarity index 100% rename from Templates/BaseGame/game/main.cs.in rename to Templates/BaseGame/game/main.tscript.in diff --git a/Templates/BaseGame/game/runTests.cs b/Templates/BaseGame/game/runTests.tscript similarity index 100% rename from Templates/BaseGame/game/runTests.cs rename to Templates/BaseGame/game/runTests.tscript diff --git a/Templates/BaseGame/game/tools/MainEditor/MainEditor.module b/Templates/BaseGame/game/tools/MainEditor/MainEditor.module index 66e95e917..0b796cd00 100644 --- a/Templates/BaseGame/game/tools/MainEditor/MainEditor.module +++ b/Templates/BaseGame/game/tools/MainEditor/MainEditor.module @@ -2,7 +2,7 @@ ModuleId="MainEditor" VersionId="1" Description="Tool that can be used to view/edit an object." - ScriptFile="MainEditor.cs" + ScriptFile="MainEditor" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Tools"> diff --git a/Templates/BaseGame/game/tools/MainEditor/MainEditor.cs b/Templates/BaseGame/game/tools/MainEditor/MainEditor.tscript similarity index 96% rename from Templates/BaseGame/game/tools/MainEditor/MainEditor.cs rename to Templates/BaseGame/game/tools/MainEditor/MainEditor.tscript index 5b41705f7..8d5b844cc 100644 --- a/Templates/BaseGame/game/tools/MainEditor/MainEditor.cs +++ b/Templates/BaseGame/game/tools/MainEditor/MainEditor.tscript @@ -2,12 +2,12 @@ function MainEditor::onCreate( %this ) { echo("\n--------- Initializing MainEditor ---------"); - //exec("tools/gui/profiles.ed.cs"); - //exec("./scripts/GuiProfiles.cs"); + //exec("tools/gui/profiles.ed." @ $TorqueScriptFileExtension); + //exec("./scripts/GuiProfiles." @ $TorqueScriptFileExtension); exec("./guis/MainEditorWindow.gui"); - //exec("./scripts/newEditorGui.cs"); + //exec("./scripts/newEditorGui." @ $TorqueScriptFileExtension); $UsePanelLayout = false; $AssetBrowserPanelState = true; diff --git a/Templates/BaseGame/game/tools/MainEditor/scripts/GuiProfiles.cs b/Templates/BaseGame/game/tools/MainEditor/scripts/GuiProfiles.tscript similarity index 100% rename from Templates/BaseGame/game/tools/MainEditor/scripts/GuiProfiles.cs rename to Templates/BaseGame/game/tools/MainEditor/scripts/GuiProfiles.tscript diff --git a/Templates/BaseGame/game/tools/MainEditor/scripts/newEditorGui.cs b/Templates/BaseGame/game/tools/MainEditor/scripts/newEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/MainEditor/scripts/newEditorGui.cs rename to Templates/BaseGame/game/tools/MainEditor/scripts/newEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/Tools.module b/Templates/BaseGame/game/tools/Tools.module index ac27644a9..93dee7e7a 100644 --- a/Templates/BaseGame/game/tools/Tools.module +++ b/Templates/BaseGame/game/tools/Tools.module @@ -2,7 +2,7 @@ ModuleId="ToolsModule" VersionId="1" Description="Module that implements the tools and editor suite." - ScriptFile="Tools.cs" + ScriptFile="Tools" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Tools"> diff --git a/Templates/BaseGame/game/tools/Tools.cs b/Templates/BaseGame/game/tools/Tools.tscript similarity index 100% rename from Templates/BaseGame/game/tools/Tools.cs rename to Templates/BaseGame/game/tools/Tools.tscript diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.cs b/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.cs rename to Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.cs b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.cs rename to Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.cs b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.cs rename to Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript diff --git a/Templates/BaseGame/game/tools/VPathEditor/main.cs b/Templates/BaseGame/game/tools/VPathEditor/main.tscript similarity index 66% rename from Templates/BaseGame/game/tools/VPathEditor/main.cs rename to Templates/BaseGame/game/tools/VPathEditor/main.tscript index 91b13ea47..27ad718ec 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/main.cs +++ b/Templates/BaseGame/game/tools/VPathEditor/main.tscript @@ -6,12 +6,12 @@ function InitializeVPathEditor() { // Gui. - exec( "./GUI/Profiles.cs" ); + exec( "./GUI/Profiles." @ $TorqueScriptFileExtension ); exec( "./GUI/VPathEditor.gui" ); // Scripts. - exec( "./Scripts/Plugin.cs" ); - exec( "./Scripts/Editor.cs" ); + exec( "./Scripts/Plugin." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Editor." @ $TorqueScriptFileExtension ); } function DestroyVPathEditor() diff --git a/Templates/BaseGame/game/tools/VerveEditor/DefaultPrefs.cs b/Templates/BaseGame/game/tools/VerveEditor/DefaultPrefs.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/DefaultPrefs.cs rename to Templates/BaseGame/game/tools/VerveEditor/DefaultPrefs.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.cs b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.cs rename to Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VController.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VController.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VController.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VController.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.tscript similarity index 73% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.tscript index 7410f038c..56a22f816 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.cs +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/main.tscript @@ -6,8 +6,8 @@ function VerveEditor::InitControllerScripts() { // Core. - exec( "./VController.cs" ); - exec( "./VControllerProperties.cs" ); + exec( "./VController." @ $TorqueScriptFileExtension ); + exec( "./VControllerProperties." @ $TorqueScriptFileExtension ); // Custom. // Exec Custom Controller Scripts. diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorControls.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorControls.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorControls.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorControls.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorHistory.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorHistory.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorHistory.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorHistory.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorPreferences.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorPreferences.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorPreferences.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorPreferences.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VCameraShakeEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VCameraShakeEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VCameraShakeEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VCameraShakeEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VDirectorEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VDirectorEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VDirectorEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VDirectorEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VFadeEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VFadeEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VFadeEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VFadeEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectAnimationEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectAnimationEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectAnimationEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectAnimationEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectToggleEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectToggleEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectToggleEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VLightObjectToggleEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VMotionEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VMotionEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VMotionEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VMotionEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VParticleEffectToggleEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VParticleEffectToggleEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VParticleEffectToggleEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VParticleEffectToggleEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VPostEffectToggleEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VPostEffectToggleEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VPostEffectToggleEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VPostEffectToggleEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSceneJumpEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSceneJumpEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSceneJumpEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSceneJumpEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VScriptEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VScriptEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VScriptEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VScriptEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VShapeAnimationEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VShapeAnimationEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VShapeAnimationEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VShapeAnimationEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSlowMoEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSlowMoEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSlowMoEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSlowMoEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSoundEffectEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSoundEffectEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSoundEffectEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSoundEffectEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSpawnSphereSpawnTargetEvent.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSpawnSphereSpawnTargetEvent.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSpawnSphereSpawnTargetEvent.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/VSpawnSphereSpawnTargetEvent.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.cs deleted file mode 100644 index a456a5e38..000000000 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.cs +++ /dev/null @@ -1,30 +0,0 @@ -//----------------------------------------------------------------------------- -// Verve -// Copyright (C) - Violent Tulip -//----------------------------------------------------------------------------- - -function VerveEditor::InitEventScripts() -{ - // Core. - exec( "./VEvent.cs" ); - - // Built-In. - exec( "./VCameraShakeEvent.cs" ); - exec( "./VDirectorEvent.cs" ); - exec( "./VFadeEvent.cs" ); - exec( "./VLightObjectAnimationEvent.cs" ); - exec( "./VLightObjectToggleEvent.cs" ); - exec( "./VMotionEvent.cs" ); - exec( "./VParticleEffectToggleEvent.cs" ); - exec( "./VPostEffectToggleEvent.cs" ); - exec( "./VSceneJumpEvent.cs" ); - exec( "./VScriptEvent.cs" ); - exec( "./VShapeAnimationEvent.cs" ); - exec( "./VSlowMoEvent.cs" ); - exec( "./VSoundEffectEvent.cs" ); - exec( "./VSpawnSphereSpawnTargetEvent.cs" ); - - // Custom. - // Exec Custom Event Scripts. -} -VerveEditor::InitEventScripts(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript new file mode 100644 index 000000000..b97027df2 --- /dev/null +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Events/main.tscript @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------------- +// Verve +// Copyright (C) - Violent Tulip +//----------------------------------------------------------------------------- + +function VerveEditor::InitEventScripts() +{ + // Core. + exec( "./VEvent." @ $TorqueScriptFileExtension ); + + // Built-In. + exec( "./VCameraShakeEvent." @ $TorqueScriptFileExtension ); + exec( "./VDirectorEvent." @ $TorqueScriptFileExtension ); + exec( "./VFadeEvent." @ $TorqueScriptFileExtension ); + exec( "./VLightObjectAnimationEvent." @ $TorqueScriptFileExtension ); + exec( "./VLightObjectToggleEvent." @ $TorqueScriptFileExtension ); + exec( "./VMotionEvent." @ $TorqueScriptFileExtension ); + exec( "./VParticleEffectToggleEvent." @ $TorqueScriptFileExtension ); + exec( "./VPostEffectToggleEvent." @ $TorqueScriptFileExtension ); + exec( "./VSceneJumpEvent." @ $TorqueScriptFileExtension ); + exec( "./VScriptEvent." @ $TorqueScriptFileExtension ); + exec( "./VShapeAnimationEvent." @ $TorqueScriptFileExtension ); + exec( "./VSlowMoEvent." @ $TorqueScriptFileExtension ); + exec( "./VSoundEffectEvent." @ $TorqueScriptFileExtension ); + exec( "./VSpawnSphereSpawnTargetEvent." @ $TorqueScriptFileExtension ); + + // Custom. + // Exec Custom Event Scripts. +} +VerveEditor::InitEventScripts(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VCameraGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VCameraGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VCameraGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VCameraGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VDirectorGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VLightObjectGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VLightObjectGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VLightObjectGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VLightObjectGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VParticleEffectGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VParticleEffectGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VParticleEffectGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VParticleEffectGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSceneObjectGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VSpawnSphereGroup.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.tscript similarity index 50% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.tscript index e8cac3c10..440b1d697 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.cs +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/main.tscript @@ -6,15 +6,15 @@ function VerveEditor::InitGroupScripts() { // Core. - exec( "./VGroup.cs" ); + exec( "./VGroup." @ $TorqueScriptFileExtension ); // Built In. - exec( "./VCameraGroup.cs" ); - exec( "./VDirectorGroup.cs" ); - exec( "./VLightObjectGroup.cs" ); - exec( "./VParticleEffectGroup.cs" ); - exec( "./VSceneObjectGroup.cs" ); - exec( "./VSpawnSphereGroup.cs" ); + exec( "./VCameraGroup." @ $TorqueScriptFileExtension ); + exec( "./VDirectorGroup." @ $TorqueScriptFileExtension ); + exec( "./VLightObjectGroup." @ $TorqueScriptFileExtension ); + exec( "./VParticleEffectGroup." @ $TorqueScriptFileExtension ); + exec( "./VSceneObjectGroup." @ $TorqueScriptFileExtension ); + exec( "./VSpawnSphereGroup." @ $TorqueScriptFileExtension ); // Custom. // Exec Custom Group Scripts. diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/CutCopyPaste.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/CutCopyPaste.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/CutCopyPaste.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/CutCopyPaste.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/EventNotify.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/EventNotify.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/EventNotify.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/EventNotify.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Factory.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Factory.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Factory.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Factory.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FactoryControls.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FactoryControls.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FactoryControls.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FactoryControls.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FieldNotify.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FieldNotify.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FieldNotify.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/FieldNotify.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeBool.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeBool.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeBool.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeBool.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeString.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeString.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeString.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeString.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeToggleEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeToggleEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeToggleEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeToggleEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCameraGroupEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCameraGroupEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCameraGroupEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCameraGroupEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCommandEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCommandEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCommandEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVCommandEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVControllerDataEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVControllerDataEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVControllerDataEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVControllerDataEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVGroupEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVGroupEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVGroupEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVGroupEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVLightAnimationDataEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVLightAnimationDataEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVLightAnimationDataEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVLightAnimationDataEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPathOrientationModeEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPathOrientationModeEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPathOrientationModeEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPathOrientationModeEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPostEffectEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPostEffectEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPostEffectEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVPostEffectEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSFXProfileEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSFXProfileEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSFXProfileEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSFXProfileEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSceneEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSceneEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSceneEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVSceneEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVShapeAnimationEnum.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVShapeAnimationEnum.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVShapeAnimationEnum.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeVShapeAnimationEnum.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.cs deleted file mode 100644 index d85bac4b2..000000000 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.cs +++ /dev/null @@ -1,25 +0,0 @@ -//----------------------------------------------------------------------------- -// Verve -// Copyright (C) - Violent Tulip -//----------------------------------------------------------------------------- - -function VerveEditor::InitInspectorFieldScripts() -{ - exec( "./TypeBool.cs" ); - exec( "./TypeData.cs" ); - exec( "./TypeEnum.cs" ); - exec( "./TypeString.cs" ); - - exec( "./TypeVCameraGroupEnum.cs" ); - exec( "./TypeVCommandEnum.cs" ); - exec( "./TypeVControllerDataEnum.cs" ); - exec( "./TypeVGroupEnum.cs" ); - exec( "./TypeVLightAnimationDataEnum.cs" ); - exec( "./TypeVPathOrientationModeEnum.cs" ); - exec( "./TypeVPostEffectEnum.cs" ); - exec( "./TypeVSceneEnum.cs" ); - exec( "./TypeVSFXProfileEnum.cs" ); - exec( "./TypeVShapeAnimationEnum.cs" ); - exec( "./TypeToggleEnum.cs" ); -} -VerveEditor::InitInspectorFieldScripts(); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.tscript new file mode 100644 index 000000000..2bfde4966 --- /dev/null +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/main.tscript @@ -0,0 +1,25 @@ +//----------------------------------------------------------------------------- +// Verve +// Copyright (C) - Violent Tulip +//----------------------------------------------------------------------------- + +function VerveEditor::InitInspectorFieldScripts() +{ + exec( "./TypeBool." @ $TorqueScriptFileExtension ); + exec( "./TypeData." @ $TorqueScriptFileExtension ); + exec( "./TypeEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeString." @ $TorqueScriptFileExtension ); + + exec( "./TypeVCameraGroupEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVCommandEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVControllerDataEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVGroupEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVLightAnimationDataEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVPathOrientationModeEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVPostEffectEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVSceneEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVSFXProfileEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeVShapeAnimationEnum." @ $TorqueScriptFileExtension ); + exec( "./TypeToggleEnum." @ $TorqueScriptFileExtension ); +} +VerveEditor::InitInspectorFieldScripts(); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Lists.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Lists.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Lists.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Lists.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Properties.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Properties.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Properties.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Properties.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.cs deleted file mode 100644 index f8a840d02..000000000 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.cs +++ /dev/null @@ -1,20 +0,0 @@ -//----------------------------------------------------------------------------- -// Verve -// Copyright (C) - Violent Tulip -//----------------------------------------------------------------------------- - -function VerveEditor::InitInspectorScripts() -{ - exec( "./Controls.cs" ); - exec( "./CutCopyPaste.cs" ); - exec( "./EventNotify.cs" ); - exec( "./Factory.cs" ); - exec( "./FactoryControls.cs" ); - exec( "./FieldNotify.cs" ); - exec( "./Lists.cs" ); - exec( "./Properties.cs" ); - exec( "./Selection.cs" ); - - exec( "./Fields/main.cs" ); -} -VerveEditor::InitInspectorScripts(); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.tscript new file mode 100644 index 000000000..bcbc87906 --- /dev/null +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/main.tscript @@ -0,0 +1,20 @@ +//----------------------------------------------------------------------------- +// Verve +// Copyright (C) - Violent Tulip +//----------------------------------------------------------------------------- + +function VerveEditor::InitInspectorScripts() +{ + exec( "./Controls." @ $TorqueScriptFileExtension ); + exec( "./CutCopyPaste." @ $TorqueScriptFileExtension ); + exec( "./EventNotify." @ $TorqueScriptFileExtension ); + exec( "./Factory." @ $TorqueScriptFileExtension ); + exec( "./FactoryControls." @ $TorqueScriptFileExtension ); + exec( "./FieldNotify." @ $TorqueScriptFileExtension ); + exec( "./Lists." @ $TorqueScriptFileExtension ); + exec( "./Properties." @ $TorqueScriptFileExtension ); + exec( "./Selection." @ $TorqueScriptFileExtension ); + + exec( "./Fields/main." @ $TorqueScriptFileExtension ); +} +VerveEditor::InitInspectorScripts(); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Persistence.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Persistence.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Persistence.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Persistence.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/ScrollNotify.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/ScrollNotify.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/ScrollNotify.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/ScrollNotify.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VCameraShakeTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VCameraShakeTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VCameraShakeTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VCameraShakeTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VDirectorTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VDirectorTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VDirectorTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VDirectorTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VFadeTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VFadeTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VFadeTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VFadeTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectAnimationTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectAnimationTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectAnimationTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectAnimationTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectToggleTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectToggleTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectToggleTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VLightObjectToggleTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VParticleEffectToggleTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VParticleEffectToggleTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VParticleEffectToggleTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VParticleEffectToggleTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VPostEffectToggleTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VPostEffectToggleTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VPostEffectToggleTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VPostEffectToggleTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSceneJumpTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSceneJumpTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSceneJumpTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSceneJumpTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VScriptEventTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VScriptEventTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VScriptEventTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VScriptEventTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VShapeAnimationTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VShapeAnimationTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VShapeAnimationTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VShapeAnimationTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSlowMoTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSlowMoTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSlowMoTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSlowMoTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSoundEffectTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSoundEffectTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSoundEffectTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSoundEffectTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSpawnSphereSpawnTargetTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSpawnSphereSpawnTargetTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSpawnSphereSpawnTargetTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VSpawnSphereSpawnTargetTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.cs deleted file mode 100644 index 7460e1364..000000000 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.cs +++ /dev/null @@ -1,33 +0,0 @@ -//----------------------------------------------------------------------------- -// Verve -// Copyright (C) - Violent Tulip -//----------------------------------------------------------------------------- - -function VerveEditor::InitTrackScripts() -{ - // Core. - exec( "./VTrack.cs" ); - - // Built-In. - exec( "./VCameraShakeTrack.cs" ); - exec( "./VDirectorTrack.cs" ); - exec( "./VFadeTrack.cs" ); - exec( "./VLightObjectAnimationTrack.cs" ); - exec( "./VLightObjectToggleTrack.cs" ); - exec( "./VMotionTrack.cs" ); - exec( "./VParticleEffectToggleTrack.cs" ); - exec( "./VPostEffectToggleTrack.cs" ); - exec( "./VSceneJumpTrack.cs" ); - exec( "./VScriptEventTrack.cs" ); - exec( "./VShapeAnimationTrack.cs" ); - exec( "./VSlowMoTrack.cs" ); - exec( "./VSoundEffectTrack.cs" ); - exec( "./VSpawnSphereSpawnTargetTrack.cs" ); - - // Custom. - // Exec Custom Track Scripts. - - // Non-Unique Group List. - $VerveEditor::NonUniqueTrackList = "VTrack VPostEffectToggleTrack VSoundEffectTrack"; -} -VerveEditor::InitTrackScripts(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.tscript new file mode 100644 index 000000000..3203862e3 --- /dev/null +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/main.tscript @@ -0,0 +1,33 @@ +//----------------------------------------------------------------------------- +// Verve +// Copyright (C) - Violent Tulip +//----------------------------------------------------------------------------- + +function VerveEditor::InitTrackScripts() +{ + // Core. + exec( "./VTrack." @ $TorqueScriptFileExtension ); + + // Built-In. + exec( "./VCameraShakeTrack." @ $TorqueScriptFileExtension ); + exec( "./VDirectorTrack." @ $TorqueScriptFileExtension ); + exec( "./VFadeTrack." @ $TorqueScriptFileExtension ); + exec( "./VLightObjectAnimationTrack." @ $TorqueScriptFileExtension ); + exec( "./VLightObjectToggleTrack." @ $TorqueScriptFileExtension ); + exec( "./VMotionTrack." @ $TorqueScriptFileExtension ); + exec( "./VParticleEffectToggleTrack." @ $TorqueScriptFileExtension ); + exec( "./VPostEffectToggleTrack." @ $TorqueScriptFileExtension ); + exec( "./VSceneJumpTrack." @ $TorqueScriptFileExtension ); + exec( "./VScriptEventTrack." @ $TorqueScriptFileExtension ); + exec( "./VShapeAnimationTrack." @ $TorqueScriptFileExtension ); + exec( "./VSlowMoTrack." @ $TorqueScriptFileExtension ); + exec( "./VSoundEffectTrack." @ $TorqueScriptFileExtension ); + exec( "./VSpawnSphereSpawnTargetTrack." @ $TorqueScriptFileExtension ); + + // Custom. + // Exec Custom Track Scripts. + + // Non-Unique Group List. + $VerveEditor::NonUniqueTrackList = "VTrack VPostEffectToggleTrack VSoundEffectTrack"; +} +VerveEditor::InitTrackScripts(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Utility.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Utility.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/Utility.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/Utility.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/VObject.cs b/Templates/BaseGame/game/tools/VerveEditor/Scripts/VObject.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Scripts/VObject.cs rename to Templates/BaseGame/game/tools/VerveEditor/Scripts/VObject.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Torque/ObjectClasses.cs b/Templates/BaseGame/game/tools/VerveEditor/Torque/ObjectClasses.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Torque/ObjectClasses.cs rename to Templates/BaseGame/game/tools/VerveEditor/Torque/ObjectClasses.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Torque/Selection.cs b/Templates/BaseGame/game/tools/VerveEditor/Torque/Selection.tscript similarity index 100% rename from Templates/BaseGame/game/tools/VerveEditor/Torque/Selection.cs rename to Templates/BaseGame/game/tools/VerveEditor/Torque/Selection.tscript diff --git a/Templates/BaseGame/game/tools/VerveEditor/Torque/main.cs b/Templates/BaseGame/game/tools/VerveEditor/Torque/main.tscript similarity index 80% rename from Templates/BaseGame/game/tools/VerveEditor/Torque/main.cs rename to Templates/BaseGame/game/tools/VerveEditor/Torque/main.tscript index 468707b4b..423b65908 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Torque/main.cs +++ b/Templates/BaseGame/game/tools/VerveEditor/Torque/main.tscript @@ -12,7 +12,7 @@ function VerveEditor::InitTorqueScripts() { // Core. - exec( "./ObjectClasses.cs" ); - exec( "./Selection.cs" ); + exec( "./ObjectClasses." @ $TorqueScriptFileExtension ); + exec( "./Selection." @ $TorqueScriptFileExtension ); } VerveEditor::InitTorqueScripts(); diff --git a/Templates/BaseGame/game/tools/VerveEditor/main.cs b/Templates/BaseGame/game/tools/VerveEditor/main.tscript similarity index 79% rename from Templates/BaseGame/game/tools/VerveEditor/main.cs rename to Templates/BaseGame/game/tools/VerveEditor/main.tscript index c085d94b6..f50360412 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/main.cs +++ b/Templates/BaseGame/game/tools/VerveEditor/main.tscript @@ -8,34 +8,34 @@ function InitializeVerveEditor() $Verve::UseSeparateWindow = true; // Preferences. - exec( "./DefaultPrefs.cs" ); + exec( "./DefaultPrefs." @ $TorqueScriptFileExtension ); // GUI. - exec( "./GUI/GuiProfiles.cs" ); + exec( "./GUI/GuiProfiles." @ $TorqueScriptFileExtension ); exec( "./GUI/VerveEditorGroupBuilder.gui" ); exec( "./GUI/VerveEditorImportPathNodes.gui" ); // Scripts. - exec( "./Scripts/Plugin.cs" ); - exec( "./Scripts/Utility.cs" ); + exec( "./Scripts/Plugin." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Utility." @ $TorqueScriptFileExtension ); - exec( "./Scripts/EditorControls.cs" ); - exec( "./Scripts/EditorHistory.cs" ); - exec( "./Scripts/EditorMenu.cs" ); - exec( "./Scripts/EditorPreferences.cs" ); - exec( "./Scripts/EditorWindow.cs" ); - exec( "./Scripts/Persistence.cs" ); - exec( "./Scripts/ScrollNotify.cs" ); - exec( "./Scripts/VObject.cs" ); + exec( "./Scripts/EditorControls." @ $TorqueScriptFileExtension ); + exec( "./Scripts/EditorHistory." @ $TorqueScriptFileExtension ); + exec( "./Scripts/EditorMenu." @ $TorqueScriptFileExtension ); + exec( "./Scripts/EditorPreferences." @ $TorqueScriptFileExtension ); + exec( "./Scripts/EditorWindow." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Persistence." @ $TorqueScriptFileExtension ); + exec( "./Scripts/ScrollNotify." @ $TorqueScriptFileExtension ); + exec( "./Scripts/VObject." @ $TorqueScriptFileExtension ); - exec( "./Scripts/Inspector/main.cs" ); + exec( "./Scripts/Inspector/main." @ $TorqueScriptFileExtension ); - exec( "./Scripts/Controller/main.cs" ); - exec( "./Scripts/Groups/main.cs" ); - exec( "./Scripts/Tracks/main.cs" ); - exec( "./Scripts/Events/main.cs" ); + exec( "./Scripts/Controller/main." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Groups/main." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Tracks/main." @ $TorqueScriptFileExtension ); + exec( "./Scripts/Events/main." @ $TorqueScriptFileExtension ); - exec( "./Torque/main.cs" ); + exec( "./Torque/main." @ $TorqueScriptFileExtension ); // Register Events. VerveEditor::RegisterEvent( "VGroupObjectUpdate" ); diff --git a/Templates/BaseGame/game/tools/assetBrowser/main.cs b/Templates/BaseGame/game/tools/assetBrowser/main.tscript similarity index 72% rename from Templates/BaseGame/game/tools/assetBrowser/main.cs rename to Templates/BaseGame/game/tools/assetBrowser/main.tscript index 6089e94b7..723545d22 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/main.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/main.tscript @@ -51,7 +51,7 @@ function initializeAssetBrowser() AssetFilterTypeList.add("TerrainMaterialAsset"); } - exec("./scripts/profiles.cs"); + exec("./scripts/profiles." @ $TorqueScriptFileExtension); exec("./guis/assetBrowser.gui"); exec("./guis/addModuleWindow.gui"); @@ -72,42 +72,42 @@ function initializeAssetBrowser() exec("./guis/assetNameEdit.gui"); exec("./guis/createNewCollectionSet.gui"); - exec("./scripts/assetBrowser.cs"); - exec("./scripts/popupMenus.cs"); - exec("./scripts/addModuleWindow.cs"); - exec("./scripts/assetImport.cs"); - exec("./scripts/assetImportConfig.cs"); - exec("./scripts/gameObjectCreator.cs"); - exec("./scripts/newAsset.cs"); - exec("./scripts/editAsset.cs"); - exec("./scripts/editModule.cs"); - exec("./scripts/selectModule.cs"); - exec("./scripts/assetImportConfigEditor.cs"); - exec("./scripts/directoryHandling.cs"); - exec("./scripts/selectPath.cs"); - exec("./scripts/looseFileAudit.cs"); + exec("./scripts/assetBrowser." @ $TorqueScriptFileExtension); + exec("./scripts/popupMenus." @ $TorqueScriptFileExtension); + exec("./scripts/addModuleWindow." @ $TorqueScriptFileExtension); + exec("./scripts/assetImport." @ $TorqueScriptFileExtension); + exec("./scripts/assetImportConfig." @ $TorqueScriptFileExtension); + exec("./scripts/gameObjectCreator." @ $TorqueScriptFileExtension); + exec("./scripts/newAsset." @ $TorqueScriptFileExtension); + exec("./scripts/editAsset." @ $TorqueScriptFileExtension); + exec("./scripts/editModule." @ $TorqueScriptFileExtension); + exec("./scripts/selectModule." @ $TorqueScriptFileExtension); + exec("./scripts/assetImportConfigEditor." @ $TorqueScriptFileExtension); + exec("./scripts/directoryHandling." @ $TorqueScriptFileExtension); + exec("./scripts/selectPath." @ $TorqueScriptFileExtension); + exec("./scripts/looseFileAudit." @ $TorqueScriptFileExtension); //Processing for the different asset types - exec("./scripts/assetTypes/component.cs"); - exec("./scripts/assetTypes/cpp.cs"); - exec("./scripts/assetTypes/gameObject.cs"); - exec("./scripts/assetTypes/gui.cs"); - exec("./scripts/assetTypes/image.cs"); - exec("./scripts/assetTypes/level.cs"); - exec("./scripts/assetTypes/material.cs"); - exec("./scripts/assetTypes/postFX.cs"); - exec("./scripts/assetTypes/script.cs"); - exec("./scripts/assetTypes/shape.cs"); - exec("./scripts/assetTypes/shapeAnimation.cs"); - exec("./scripts/assetTypes/sound.cs"); - exec("./scripts/assetTypes/stateMachine.cs"); - exec("./scripts/assetTypes/cubemap.cs"); - exec("./scripts/assetTypes/folder.cs"); - exec("./scripts/assetTypes/terrain.cs"); - exec("./scripts/assetTypes/terrainMaterial.cs"); - exec("./scripts/assetTypes/datablockObjects.cs"); - exec("./scripts/assetTypes/looseFiles.cs"); - exec("./scripts/assetTypes/prefab.cs"); + exec("./scripts/assetTypes/component." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/cpp." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/gameObject." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/gui." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/image." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/level." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/material." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/postFX." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/script." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/shape." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/shapeAnimation." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/sound." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/stateMachine." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/cubemap." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/folder." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/terrain." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/terrainMaterial." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/datablockObjects." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/looseFiles." @ $TorqueScriptFileExtension); + exec("./scripts/assetTypes/prefab." @ $TorqueScriptFileExtension); new ScriptObject( AssetBrowserPlugin ) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.tscript similarity index 96% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.tscript index 61b671922..7a704613e 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/addModuleWindow.tscript @@ -46,13 +46,13 @@ function AssetBrowser_addModuleWindow::CreateNewModule(%this) %moduleFilePath = "data/" @ %newModuleName; %moduleDefinitionFilePath = %moduleFilePath @ "/" @ %newModuleName @ ".module"; - %moduleScriptFilePath = %moduleFilePath @ "/" @ %newModuleName @ ".cs"; + %moduleScriptFilePath = %moduleFilePath @ "/" @ %newModuleName @ "." @ $TorqueScriptFileExtension; %newModule = new ModuleDefinition() { ModuleId = %newModuleName; versionId = 1; - ScriptFile = %newModuleName @ ".cs"; + ScriptFile = %newModuleName @ "." @ $TorqueScriptFileExtension; CreateFunction="onCreate"; DestroyFunction="onDestroy"; Group = "Game"; @@ -70,7 +70,7 @@ function AssetBrowser_addModuleWindow::CreateNewModule(%this) %file = new FileObject(); %templateFile = new FileObject(); - %moduleTemplateCodeFilePath = AssetBrowser.templateFilesPath @ "module.cs.template"; + %moduleTemplateCodeFilePath = AssetBrowser.templateFilesPath @ "module." @ $TorqueScriptFileExtension @ ".template"; if(%file.openForWrite(%moduleScriptFilePath) && %templateFile.openForRead(%moduleTemplateCodeFilePath)) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.tscript similarity index 97% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.tscript index 90d999b8e..06d43a430 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/addPackageWindow.tscript @@ -41,13 +41,13 @@ function AssetBrowser_addPackageWindow::CreateNewPackage(%this) %moduleFilePath = "data/" @ %newPackageName; %moduleDefinitionFilePath = %moduleFilePath @ "/" @ %newPackageName @ ".module"; - %moduleScriptFilePath = %moduleFilePath @ "/" @ %newPackageName @ ".cs"; + %moduleScriptFilePath = %moduleFilePath @ "/" @ %newPackageName @ "." @ $TorqueScriptFileExtension; %newPackage = new ModuleDefinition() { ModuleId = %newPackageName; versionId = 1; - ScriptFile = %newPackageName @ ".cs"; + ScriptFile = %newPackageName @ "." @ $TorqueScriptFileExtension; CreateFunction="onCreate"; DestroyFunction="onDestroy"; Group = "Game"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript similarity index 99% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index cd40caa40..82625e981 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -984,7 +984,7 @@ function AssetBrowser::deleteMaterial( %this, %materialName, %secondFilter, %sec if( %materialName.getFilename() !$= "" && %materialName.getFilename() !$= "tools/gui/AssetBrowser.ed.gui" && - %materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs" ) + %materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension ) { AssetBrowserPerMan.removeObjectFromFile(%materialName); AssetBrowserPerMan.saveDirty(); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript similarity index 97% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript index 461a525f5..2189b579f 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.tscript @@ -151,7 +151,7 @@ function getAssetTypeByFilename(%filePath) return "ShapeAsset"; else if( isSoundFormat(%fileExt)) return "SoundAsset"; - else if( %fileExt $= ".cs" || %fileExt $= ".cs.dso" ) + else if( %fileExt $= "." @ $TorqueScriptFileExtension || %fileExt $= "." @ $TorqueScriptFileExtension @ ".dso" ) return "ScriptAsset"; else if( %fileExt $= ".gui" || %fileExt $= ".gui.dso" ) return "GUIAsset"; @@ -188,7 +188,7 @@ function AssetBrowser::onDropFile( %this, %filePath ) %assetItem = %this.addImportingAsset("ShapeAsset", %filePath); else if( isSoundFormat(%fileExt)) %assetItem = %this.addImportingAsset("SoundAsset", %filePath); - else if( %fileExt $= ".cs" || %fileExt $= ".cs.dso" ) + else if( %fileExt $= "." @ $TorqueScriptFileExtension || %fileExt $= "." @ $TorqueScriptFileExtension @ ".dso" ) %assetItem = %this.addImportingAsset("ScriptAsset", %filePath); else if( %fileExt $= ".gui" || %fileExt $= ".gui.dso" ) %assetItem = %this.addImportingAsset("GUIAsset", %filePath); @@ -238,13 +238,13 @@ function AssetBrowser::onDropZipFile(%this, %filePath) %this.importAssetListArray.add("SoundAsset", %filePath); else if( (%fileExt $= ".gui") || (%fileExt $= ".gui.dso")) %this.importAssetListArray.add("GUIAsset", %filePath); - //else if( (%fileExt $= ".cs") || (%fileExt $= ".dso")) + //else if( (%fileExt $= "." @ $TorqueScriptFileExtension) || (%fileExt $= ".dso")) // %this.importAssetListArray.add("Script", %filePath); else if( (%fileExt $= ".mis")) %this.importAssetListArray.add("LevelAsset", %filePath);*/ - // For now, if it's a .cs file, we'll assume it's a behavior. - //if (fileExt(%fileFrom) !$= ".cs") + // For now, if it's a .tscript file, we'll assume it's a behavior. + //if (fileExt(%fileFrom) !$= "." @ $TorqueScriptFileExtension) // continue; %fileTo = expandFilename("^tools/assetBrowser/importTemp/") @ %fileFrom; @@ -286,13 +286,13 @@ function AssetBrowser::onDropFolder(%this, %filePath) %this.importAssetListArray.add("SoundAsset", %filePath); else if( (%fileExt $= ".gui") || (%fileExt $= ".gui.dso")) %this.importAssetListArray.add("GUIAsset", %filePath); - //else if( (%fileExt $= ".cs") || (%fileExt $= ".dso")) + //else if( (%fileExt $= "." @ $TorqueScriptFileExtension) || (%fileExt $= ".dso")) // %this.importAssetListArray.add("Script", %filePath); else if( (%fileExt $= ".mis")) %this.importAssetListArray.add("LevelAsset", %filePath); - // For now, if it's a .cs file, we'll assume it's a behavior. - if (fileExt(%fileFrom) !$= ".cs") + // For now, if it's a .tscript file, we'll assume it's a behavior. + if (fileExt(%fileFrom) !$= "." @ $TorqueScriptFileExtension) continue; %fileTo = expandFilename("^game/behaviors/") @ fileName(%fileFrom); @@ -942,7 +942,7 @@ function ImportAssetWindow::addNewImportingAsset(%this, %filterType) %type = "ShapeAsset"; else if( isSoundFormat(%fileExt)) %type = "SoundAsset"; - else if( %fileExt $= ".cs" || %fileExt $= ".cs.dso" ) + else if( %fileExt $= "." @ $TorqueScriptFileExtension || %fileExt $= "." @ $TorqueScriptFileExtension @ ".dso" ) %type = "ScriptAsset"; else if( %fileExt $= ".gui" || %fileExt $= ".gui.dso" ) %type = "GUIAsset"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfig.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetImportConfigEditor.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/assetTypeExample.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/assetTypeExample.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/assetTypeExample.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/assetTypeExample.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript similarity index 95% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript index 8c6ea6809..8d0b6eaee 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/component.tscript @@ -6,7 +6,7 @@ function AssetBrowser::createComponentAsset(%this) %assetName = AssetBrowser.newAssetSettings.assetName; %tamlpath = %modulePath @ "/components/" @ %assetName @ ".asset.taml"; - %scriptPath = %modulePath @ "/components/" @ %assetName @ ".cs"; + %scriptPath = %modulePath @ "/components/" @ %assetName @ "." @ $TorqueScriptFileExtension; %asset = new ComponentAsset() { @@ -17,7 +17,7 @@ function AssetBrowser::createComponentAsset(%this) friendlyName = AssetBrowser.newAssetSettings.friendlyName; componentType = AssetBrowser.newAssetSettings.componentGroup; description = AssetBrowser.newAssetSettings.description; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; }; TamlWrite(%asset, %tamlpath); @@ -25,7 +25,7 @@ function AssetBrowser::createComponentAsset(%this) %file = new FileObject(); %templateFile = new FileObject(); - %templateCodeFilePath = %this.templateFilesPath @ "componentFile.cs.template"; + %templateCodeFilePath = %this.templateFilesPath @ "componentFile." @ $TorqueScriptFileExtension @ ".template"; if(%file.openForWrite(%scriptPath) && %templateFile.openForRead(%templateCodeFilePath)) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cpp.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cubemap.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cubemap.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cubemap.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/cubemap.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/datablockObjects.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/datablockObjects.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/datablockObjects.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/datablockObjects.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/decal.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/decal.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/decal.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/decal.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/explosion.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/explosion.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/explosion.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/explosion.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/folder.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/folder.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/folder.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/folder.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/forest.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/forest.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/forest.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/forest.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gameObject.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.tscript similarity index 96% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.tscript index 591fe5f75..c4e2b99c7 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/gui.tscript @@ -9,13 +9,13 @@ function AssetBrowser::createGUIAsset(%this) %tamlpath = %assetPath @ %assetName @ ".asset.taml"; %guipath = %assetPath @ %assetName @ ".gui"; - %scriptPath = %assetPath @ %assetName @ ".cs"; + %scriptPath = %assetPath @ %assetName @ "." @ $TorqueScriptFileExtension; %asset = new GUIAsset() { AssetName = %assetName; versionId = 1; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; guiFile = %assetName @ ".gui"; }; @@ -48,7 +48,7 @@ function AssetBrowser::createGUIAsset(%this) warnf("CreateGUIAsset - Something went wrong and we couldn't write the GUI file!"); } - %scriptTemplateCodeFilePath = %this.templateFilesPath @ "guiFile.cs.template"; + %scriptTemplateCodeFilePath = %this.templateFilesPath @ "guiFile." @ $TorqueScriptFileExtension @ ".template"; if(%file.openForWrite(%scriptPath) && %templateFile.openForRead(%scriptTemplateCodeFilePath)) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript similarity index 98% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript index 286793efd..d57f1594c 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/level.tscript @@ -29,7 +29,7 @@ function AssetBrowser::createLevelAsset(%this) versionId = 1; LevelFile = %assetName @ ".mis"; DecalsFile = %assetName @ ".mis.decals"; - PostFXPresetFile = %assetName @ ".postfxpreset.cs"; + PostFXPresetFile = %assetName @ ".postfxpreset." @ $TorqueScriptFileExtension; ForestFile = %assetName @ ".forest"; NavmeshFile = %assetName @ ".nav"; LevelName = AssetBrowser.newAssetSettings.levelName; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/looseFiles.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/looseFiles.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/looseFiles.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/looseFiles.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript similarity index 99% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript index b0582b6b4..f4ba45999 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript @@ -323,14 +323,14 @@ function AssetBrowser::importMaterialAsset(%this, %assetItem) %assetPath = AssetBrowser.dirHandler.currentAddress @ "/"; %tamlpath = %assetPath @ %assetName @ ".asset.taml"; %sgfPath = %assetPath @ %assetName @ ".sgf"; - %scriptPath = %assetPath @ %assetName @ ".cs"; + %scriptPath = %assetPath @ %assetName @ "." @ $TorqueScriptFileExtension; %newAsset = new MaterialAsset() { assetName = %assetName; versionId = 1; shaderGraph = %sgfPath; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; originalFilePath = %filePath; materialDefinitionName = %assetName; }; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/particle.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/particle.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/particle.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/particle.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.tscript similarity index 96% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.tscript index 030f7baea..06ca879f6 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/postFX.tscript @@ -6,7 +6,7 @@ function AssetBrowser::createPostEffectAsset(%this) %assetPath = AssetBrowser.dirHandler.currentAddress @ "/"; %tamlpath = %assetPath @ %assetName @ ".asset.taml"; - %scriptPath = %assetPath @ %assetName @ ".cs"; + %scriptPath = %assetPath @ %assetName @ "." @ $TorqueScriptFileExtension; %hlslPath = %assetPath @ %assetName @ "P.hlsl"; %glslPath = %assetPath @ %assetName @ "P.glsl"; @@ -14,7 +14,7 @@ function AssetBrowser::createPostEffectAsset(%this) { AssetName = %assetName; versionId = 1; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; hlslShader = %assetName @ "P.hlsl"; glslShader = %assetName @ "P.glsl"; }; @@ -27,7 +27,7 @@ function AssetBrowser::createPostEffectAsset(%this) %file = new FileObject(); %templateFile = new FileObject(); - %postFXTemplateCodeFilePath = %this.templateFilesPath @ "postFXFile.cs.template"; + %postFXTemplateCodeFilePath = %this.templateFilesPath @ "postFXFile." @ $TorqueScriptFileExtension @ ".template"; if(%file.openForWrite(%scriptPath) && %templateFile.openForRead(%postFXTemplateCodeFilePath)) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/prefab.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/prefab.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/prefab.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/prefab.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript similarity index 92% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript index 27241437e..adc921013 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/script.tscript @@ -8,13 +8,13 @@ function AssetBrowser::createScriptAsset(%this) %assetPath = AssetBrowser.dirHandler.currentAddress @ "/"; %tamlpath = %assetPath @ %assetName @ ".asset.taml"; - %scriptPath = %assetPath @ %assetName @ ".cs"; + %scriptPath = %assetPath @ %assetName @ "." @ $TorqueScriptFileExtension; %asset = new ScriptAsset() { AssetName = %assetName; versionId = 1; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; }; TamlWrite(%asset, %tamlpath); @@ -99,7 +99,7 @@ function AssetBrowser::buildScriptAssetPreview(%this, %assetDef, %previewData) if(%assetDef.isServerSide) %previewData.previewImage = "tools/assetBrowser/art/serverScriptIcon"; else - %previewData.previewImage = "tools/assetBrowser/art/clientScriptIcon"; + %previewData.previewImage = "tools/assetBrowser/art/clien" @ $TorqueScriptFileExtension @ "Icon"; %previewData.assetFriendlyName = %assetDef.assetName; %previewData.assetDesc = %assetDef.description; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shapeAnimation.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shapeAnimation.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shapeAnimation.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shapeAnimation.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/sound.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/stateMachine.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript similarity index 94% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript index 4f90f3050..fb53a25fa 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrainMaterial.tscript @@ -9,13 +9,13 @@ function AssetBrowser::createTerrainMaterialAsset(%this) %assetPath = AssetBrowser.dirHandler.currentAddress @ "/"; %tamlpath = %assetPath @ %assetName @ ".asset.taml"; - %scriptPath = %assetPath @ %assetName @ ".cs"; + %scriptPath = %assetPath @ %assetName @ "." @ $TorqueScriptFileExtension; %asset = new TerrainMaterialAsset() { AssetName = %assetName; versionId = 1; - scriptFile = %assetName @ ".cs"; + scriptFile = %assetName @ "." @ $TorqueScriptFileExtension; materialDefinitionName = %assetName; }; @@ -33,7 +33,7 @@ function AssetBrowser::createTerrainMaterialAsset(%this) %file = new FileObject(); %templateFile = new FileObject(); - %templateFilePath = %this.templateFilesPath @ "terrainMaterial.cs.template"; + %templateFilePath = %this.templateFilesPath @ "terrainMaterial." @ $TorqueScriptFileExtension @ ".template"; if(%file.openForWrite(%scriptPath) && %templateFile.openForRead(%templateFilePath)) { diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/directoryHandling.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript similarity index 99% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript index 3a9f8d1e1..82385f25f 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript @@ -301,7 +301,7 @@ function AssetBrowser::doDuplicateAsset(%this) { //this acts as a redirect based on asset type and will enact the appropriate function //so for a GameObjectAsset, it'll become %this.duplicateGameObjectAsset(%assetDef, %targetModule); - //and call to the tools/assetBrowser/scripts/assetTypes/gameObject.cs file for implementation + //and call to the tools/assetBrowser/scripts/assetTypes/gameObject.tscript file for implementation if(%this.isMethod("duplicate"@%assetType)) eval(%this @ ".duplicate"@%assetType@"("@%assetDef@","@AssetBrowser_assetNameEditTxt.text@");"); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.tscript similarity index 99% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.tscript index b8d6a404f..4d5a22ff1 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/editModule.tscript @@ -232,7 +232,7 @@ function AssetBrowser::RefreshModuleDependencies(%this, %moduleDef) //AssetBrowser.RefreshModuleDependencies(16823); %modulePath = filePath(%moduleDef.ModuleFilePath); - %filePattern = "*.cs" TAB "*.taml" TAB "*.mis"; + %filePattern = "*." @ $TorqueScriptFileExtension TAB "*.taml" TAB "*.mis"; //First, wipe out any files inside the folder first %file = makeFullPath(findFirstFileMultiExpr( %filePattern, true)); diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.tscript similarity index 95% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.tscript index 230167daf..4ed01b458 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/gameObjectCreator.tscript @@ -74,7 +74,7 @@ function GameObjectCreateBtn::onClick(%this) %file = new FileObject(); - if(%file.openForWrite(%path @ "\\" @ %className @ ".cs")) + if(%file.openForWrite(%path @ "\\" @ %className @ "." @ $TorqueScriptFileExtension)) { %file.writeline("function " @ %className @ "::onAdd(%this)\n{\n\n}\n"); %file.writeline("function " @ %className @ "::onRemove(%this)\n{\n\n}\n"); @@ -86,7 +86,7 @@ function GameObjectCreateBtn::onClick(%this) //set up the paths %tamlPath = %path @ %className @ ".taml"; - %scriptPath = %path @ %className @ ".cs"; + %scriptPath = %path @ %className @ "." @ $TorqueScriptFileExtension; saveGameObject(%className, %tamlPath, %scriptPath); %asset = new GameObjectAsset() diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript similarity index 99% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript index adba15edb..28fafde0e 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript @@ -15,7 +15,7 @@ function LooseFileAuditWindow::buildPopupMenus(%this) }; } - //Done with .cs files + //Done with .tscript files if( !isObject( ScriptLooseFilePopup ) ) { %this.ImportAssetActions = new PopupMenu( ScriptLooseFilePopup ) @@ -159,7 +159,7 @@ function LooseFileList::onRightMouseDown(%this, %itemId) { ImageLooseFilePopup.showPopup(Canvas); } - else if(%ext $= ".cs") + else if(%ext $= "." @ $TorqueScriptFileExtension) { ScriptLooseFilePopup.showPopup(Canvas); } diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/newAsset.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/profiles.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/profiles.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/profiles.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/profiles.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/selectModule.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/selectModule.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/selectModule.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/selectModule.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/selectPackage.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/selectPackage.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/selectPackage.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/selectPackage.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.tscript similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.cs rename to Templates/BaseGame/game/tools/assetBrowser/scripts/selectPath.tscript diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/componentFile.cs.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/componentFile.tscript.template similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/componentFile.cs.template rename to Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/componentFile.tscript.template diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.cs.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.tscript.template similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.cs.template rename to Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/guiFile.tscript.template diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/module.cs.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/module.tscript.template similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/module.cs.template rename to Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/module.tscript.template diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/postFXFile.cs.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/postFXFile.tscript.template similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/postFXFile.cs.template rename to Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/postFXFile.tscript.template diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/terrainMaterial.cs.template b/Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/terrainMaterial.tscript.template similarity index 100% rename from Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/terrainMaterial.cs.template rename to Templates/BaseGame/game/tools/assetBrowser/scripts/templateFiles/terrainMaterial.tscript.template diff --git a/Templates/BaseGame/game/tools/base/canvas/baseCanvas.ed.cs b/Templates/BaseGame/game/tools/base/canvas/baseCanvas.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/canvas/baseCanvas.ed.cs rename to Templates/BaseGame/game/tools/base/canvas/baseCanvas.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/images/materials.cs b/Templates/BaseGame/game/tools/base/images/materials.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/images/materials.cs rename to Templates/BaseGame/game/tools/base/images/materials.tscript diff --git a/Templates/BaseGame/game/tools/base/main.cs b/Templates/BaseGame/game/tools/base/main.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/main.cs rename to Templates/BaseGame/game/tools/base/main.tscript diff --git a/Templates/BaseGame/game/tools/base/menuBar/baseMenu.ed.cs b/Templates/BaseGame/game/tools/base/menuBar/baseMenu.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/menuBar/baseMenu.ed.cs rename to Templates/BaseGame/game/tools/base/menuBar/baseMenu.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/menuBar/fileMenu.ed.cs b/Templates/BaseGame/game/tools/base/menuBar/fileMenu.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/menuBar/fileMenu.ed.cs rename to Templates/BaseGame/game/tools/base/menuBar/fileMenu.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/menuBar/menuBuilder.ed.cs b/Templates/BaseGame/game/tools/base/menuBar/menuBuilder.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/menuBar/menuBuilder.ed.cs rename to Templates/BaseGame/game/tools/base/menuBar/menuBuilder.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/utils/inspector.ed.cs b/Templates/BaseGame/game/tools/base/utils/inspector.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/utils/inspector.ed.cs rename to Templates/BaseGame/game/tools/base/utils/inspector.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/utils/objectNameValidation.ed.cs b/Templates/BaseGame/game/tools/base/utils/objectNameValidation.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/utils/objectNameValidation.ed.cs rename to Templates/BaseGame/game/tools/base/utils/objectNameValidation.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.cs b/Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.cs rename to Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/utils/treeViewFilterCtrls.ed.cs b/Templates/BaseGame/game/tools/base/utils/treeViewFilterCtrls.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/utils/treeViewFilterCtrls.ed.cs rename to Templates/BaseGame/game/tools/base/utils/treeViewFilterCtrls.ed.tscript diff --git a/Templates/BaseGame/game/tools/base/utils/undoActions.ed.cs b/Templates/BaseGame/game/tools/base/utils/undoActions.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/base/utils/undoActions.ed.cs rename to Templates/BaseGame/game/tools/base/utils/undoActions.ed.tscript diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.cs b/Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript similarity index 100% rename from Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.cs rename to Templates/BaseGame/game/tools/componentEditor/interface/materialFieldType.tscript diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.cs b/Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript similarity index 100% rename from Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.cs rename to Templates/BaseGame/game/tools/componentEditor/interface/stateMachineField.tscript diff --git a/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.cs b/Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript similarity index 100% rename from Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.cs rename to Templates/BaseGame/game/tools/componentEditor/interface/typeMaskFieldType.tscript diff --git a/Templates/BaseGame/game/tools/componentEditor/main.cs b/Templates/BaseGame/game/tools/componentEditor/main.tscript similarity index 77% rename from Templates/BaseGame/game/tools/componentEditor/main.cs rename to Templates/BaseGame/game/tools/componentEditor/main.tscript index 643e74c0f..7dc10a11f 100644 --- a/Templates/BaseGame/game/tools/componentEditor/main.cs +++ b/Templates/BaseGame/game/tools/componentEditor/main.tscript @@ -21,15 +21,15 @@ //----------------------------------------------------------------------------- //Scripts -exec("./scripts/componentEditor.ed.cs"); -exec("./scripts/stateMachineEditor.ed.cs"); -exec("./scripts/superToolTipDlg.ed.cs"); +exec("./scripts/componentEditor.ed." @ $TorqueScriptFileExtension); +exec("./scripts/stateMachineEditor.ed." @ $TorqueScriptFileExtension); +exec("./scripts/superToolTipDlg.ed." @ $TorqueScriptFileExtension); //gui exec("./gui/superToolTipDlg.ed.gui"); exec("./gui/stateMachineDlg.ed.gui"); //field types -exec("./interface/materialFieldType.cs"); -exec("./interface/typeMaskFieldType.cs"); -exec("./interface/stateMachineField.cs"); \ No newline at end of file +exec("./interface/materialFieldType." @ $TorqueScriptFileExtension); +exec("./interface/typeMaskFieldType." @ $TorqueScriptFileExtension); +exec("./interface/stateMachineField." @ $TorqueScriptFileExtension); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.cs b/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.cs rename to Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/componentEditor/scripts/superToolTipDlg.ed.cs b/Templates/BaseGame/game/tools/componentEditor/scripts/superToolTipDlg.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/componentEditor/scripts/superToolTipDlg.ed.cs rename to Templates/BaseGame/game/tools/componentEditor/scripts/superToolTipDlg.ed.tscript diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditor.cs b/Templates/BaseGame/game/tools/convexEditor/convexEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/convexEditor/convexEditor.cs rename to Templates/BaseGame/game/tools/convexEditor/convexEditor.tscript diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/convexEditor/convexEditorGui.cs rename to Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/convexEditor/main.cs b/Templates/BaseGame/game/tools/convexEditor/main.tscript similarity index 97% rename from Templates/BaseGame/game/tools/convexEditor/main.cs rename to Templates/BaseGame/game/tools/convexEditor/main.tscript index 2fef1a43d..6ecb12b6c 100644 --- a/Templates/BaseGame/game/tools/convexEditor/main.cs +++ b/Templates/BaseGame/game/tools/convexEditor/main.tscript @@ -24,12 +24,12 @@ function initializeConvexEditor() { echo(" % - Initializing Sketch Tool"); - exec( "./convexEditor.cs" ); + exec( "./convexEditor." @ $TorqueScriptFileExtension ); exec( "./convexEditorGui.gui" ); exec( "./convexEditorToolbar.ed.gui" ); - exec( "./convexEditorGui.cs" ); + exec( "./convexEditorGui." @ $TorqueScriptFileExtension ); exec( "./convexEditorSidebarGui.gui" ); - exec( "./materials.cs" ); + exec( "./materials." @ $TorqueScriptFileExtension ); ConvexEditorGui.setVisible( false ); ConvexEditorOptionsWindow.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/convexEditor/materials.cs b/Templates/BaseGame/game/tools/convexEditor/materials.tscript similarity index 100% rename from Templates/BaseGame/game/tools/convexEditor/materials.cs rename to Templates/BaseGame/game/tools/convexEditor/materials.tscript diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.cs b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript similarity index 99% rename from Templates/BaseGame/game/tools/datablockEditor/datablockEditor.cs rename to Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript index eb4a6b8dd..8d5ac4932 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.cs +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript @@ -23,7 +23,7 @@ // Main code for the Datablock Editor plugin. -$DATABLOCK_EDITOR_DEFAULT_FILENAME = "art/datablocks/managedDatablocks.cs"; +$DATABLOCK_EDITOR_DEFAULT_FILENAME = "art/datablocks/managedDatablocks." @ $TorqueScriptFileExtension; //============================================================================================= // Initialization. @@ -375,7 +375,7 @@ function DatablockEditorPlugin::flagDatablockAsDirty(%this, %datablock, %dirty ) function DatablockEditorPlugin::showSaveNewFileDialog(%this) { %currentFile = %this.getSelectedDatablock().getFilename(); - getSaveFilename( "TorqueScript Files|*.cs|All Files|*.*", %this @ ".saveNewFileFinish", %currentFile, false ); + getSaveFilename( "TorqueScript Files|*." @ $TorqueScriptFileExtension @ "|All Files|*.*", %this @ ".saveNewFileFinish", %currentFile, false ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.cs b/Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript similarity index 100% rename from Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.cs rename to Templates/BaseGame/game/tools/datablockEditor/datablockEditorUndo.tscript diff --git a/Templates/BaseGame/game/tools/datablockEditor/main.cs b/Templates/BaseGame/game/tools/datablockEditor/main.tscript similarity index 95% rename from Templates/BaseGame/game/tools/datablockEditor/main.cs rename to Templates/BaseGame/game/tools/datablockEditor/main.tscript index e7626a8b3..f577263cf 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/main.cs +++ b/Templates/BaseGame/game/tools/datablockEditor/main.tscript @@ -27,8 +27,8 @@ function initializeDatablockEditor() { echo( " - Initializing Datablock Editor" ); - exec("./datablockEditor.cs"); - exec("./datablockEditorUndo.cs"); + exec("./datablockEditor." @ $TorqueScriptFileExtension); + exec("./datablockEditorUndo." @ $TorqueScriptFileExtension); exec("./DatablockEditorTreeWindow.ed.gui"); exec("./DatablockEditorInspectorWindow.ed.gui"); exec("./DatablockEditorCreatePrompt.ed.gui"); diff --git a/Templates/BaseGame/game/tools/debugger/main.cs b/Templates/BaseGame/game/tools/debugger/main.tscript similarity index 97% rename from Templates/BaseGame/game/tools/debugger/main.cs rename to Templates/BaseGame/game/tools/debugger/main.tscript index f51222665..9d4f7f798 100644 --- a/Templates/BaseGame/game/tools/debugger/main.cs +++ b/Templates/BaseGame/game/tools/debugger/main.tscript @@ -33,7 +33,7 @@ function initializeDebugger() echo(" % - Initializing Debugger"); // Load the scripts. - exec("./scripts/debugger.ed.cs"); + exec("./scripts/debugger.ed." @ $TorqueScriptFileExtension); // And the guis. exec("./gui/breakConditionDlg.ed.gui"); diff --git a/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.cs b/Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.cs rename to Templates/BaseGame/game/tools/debugger/scripts/debugger.ed.tscript diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditor.cs b/Templates/BaseGame/game/tools/decalEditor/decalEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/decalEditor/decalEditor.cs rename to Templates/BaseGame/game/tools/decalEditor/decalEditor.tscript diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorActions.cs b/Templates/BaseGame/game/tools/decalEditor/decalEditorActions.tscript similarity index 100% rename from Templates/BaseGame/game/tools/decalEditor/decalEditorActions.cs rename to Templates/BaseGame/game/tools/decalEditor/decalEditorActions.tscript diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.cs b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/decalEditor/decalEditorGui.cs rename to Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/decalEditor/main.cs b/Templates/BaseGame/game/tools/decalEditor/main.tscript similarity index 93% rename from Templates/BaseGame/game/tools/decalEditor/main.cs rename to Templates/BaseGame/game/tools/decalEditor/main.tscript index 06dd96f81..d948f1133 100644 --- a/Templates/BaseGame/game/tools/decalEditor/main.cs +++ b/Templates/BaseGame/game/tools/decalEditor/main.tscript @@ -24,12 +24,12 @@ function initializeDecalEditor() { echo(" % - Initializing Decal Editor"); - $decalDataFile = "art/decals/managedDecalData.cs"; + $decalDataFile = "art/decals/managedDecalData." @ $TorqueScriptFileExtension; - exec( "./decalEditor.cs" ); + exec( "./decalEditor." @ $TorqueScriptFileExtension ); exec( "./decalEditorGui.gui" ); - exec( "./decalEditorGui.cs" ); - exec( "./decalEditorActions.cs" ); + exec( "./decalEditorGui." @ $TorqueScriptFileExtension ); + exec( "./decalEditorActions." @ $TorqueScriptFileExtension ); // Add ourselves to EditorGui, where all the other tools reside DecalEditorGui.setVisible( false ); @@ -66,9 +66,9 @@ function destroyDecalEditor() // JCF: helper for during development function reinitDecalEditor() { - exec( "./main.cs" ); - exec( "./decalEditor.cs" ); - exec( "./decalEditorGui.cs" ); + exec( "./main." @ $TorqueScriptFileExtension ); + exec( "./decalEditor." @ $TorqueScriptFileExtension ); + exec( "./decalEditorGui." @ $TorqueScriptFileExtension ); } function DecalEditorPlugin::onWorldEditorStartup( %this ) diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs b/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/main.cs b/Templates/BaseGame/game/tools/editorClasses/main.tscript similarity index 63% rename from Templates/BaseGame/game/tools/editorClasses/main.cs rename to Templates/BaseGame/game/tools/editorClasses/main.tscript index 7ebad5d4c..c85830ddc 100644 --- a/Templates/BaseGame/game/tools/editorClasses/main.cs +++ b/Templates/BaseGame/game/tools/editorClasses/main.tscript @@ -34,7 +34,7 @@ function initializeEditorClasses() // Load Editor Profiles //----------------------------------------------------------------------------- - exec("./scripts/fileLoader.ed.cs"); + exec("./scripts/fileLoader.ed." @ $TorqueScriptFileExtension); loadDirectory( expandFilename("./gui/panels") ); @@ -43,39 +43,39 @@ function initializeEditorClasses() // Setup Preferences Manager //----------------------------------------------------------------------------- - exec("./scripts/preferencesManager.ed.cs"); + exec("./scripts/preferencesManager.ed." @ $TorqueScriptFileExtension); initPreferencesManager(); //----------------------------------------------------------------------------- // Load Form Managers //----------------------------------------------------------------------------- - exec("./scripts/guiFormLibraryManager.ed.cs"); - exec("./scripts/guiFormContentManager.ed.cs"); - exec("./scripts/guiFormReferenceManager.ed.cs"); - exec("./scripts/guiFormLayoutManager.ed.cs"); - exec("./scripts/guiFormMessageManager.ed.cs"); - exec("./scripts/expandos.ed.cs"); - exec("./scripts/utility.ed.cs"); + exec("./scripts/guiFormLibraryManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiFormContentManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiFormReferenceManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiFormLayoutManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiFormMessageManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/expandos.ed." @ $TorqueScriptFileExtension); + exec("./scripts/utility.ed." @ $TorqueScriptFileExtension); setupBaseExpandos(); // User Display - exec("./scripts/contextPopup.ed.cs"); + exec("./scripts/contextPopup.ed." @ $TorqueScriptFileExtension); // Project Support - exec("./scripts/projects/projectEvents.ed.cs"); - exec("./scripts/projects/projectInternalInterface.ed.cs"); + exec("./scripts/projects/projectEvents.ed." @ $TorqueScriptFileExtension); + exec("./scripts/projects/projectInternalInterface.ed." @ $TorqueScriptFileExtension); // Input - exec("./scripts/input/inputEvents.ed.cs"); - exec("./scripts/input/dragDropEvents.ed.cs"); - exec("./scripts/input/applicationEvents.ed.cs"); + exec("./scripts/input/inputEvents.ed." @ $TorqueScriptFileExtension); + exec("./scripts/input/dragDropEvents.ed." @ $TorqueScriptFileExtension); + exec("./scripts/input/applicationEvents.ed." @ $TorqueScriptFileExtension); // Form Class - exec("./scripts/guiFormClass.ed.cs"); - exec("./scripts/guiClasses/guiThumbnailPopup.ed.cs"); - exec("./scripts/guiClasses/guiThumbnail.ed.cs"); - exec("./scripts/RSSNews/RSSFeedScript.ed.cs"); + exec("./scripts/guiFormClass.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiClasses/guiThumbnailPopup.ed." @ $TorqueScriptFileExtension); + exec("./scripts/guiClasses/guiThumbnail.ed." @ $TorqueScriptFileExtension); + exec("./scripts/RSSNews/RSSFeedScript.ed." @ $TorqueScriptFileExtension); loadDirectory( expandFilename("./scripts/core") ); loadDirectory( expandFilename("./scripts/platform") ); diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.tscript similarity index 96% rename from Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.tscript index b61109efb..8b12dbe72 100644 --- a/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.cs +++ b/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSFeedScript.ed.tscript @@ -28,7 +28,7 @@ $RSSFeed::userAgent = "TorqueGameEngineAdvances/1.1"; $RSSFeed::maxNewHeadlines = 10; // Load up the helper objects -exec( "./RSSStructs.ed.cs" ); +exec( "./RSSStructs.ed." @ $TorqueScriptFileExtension ); function RSSFeedObject::onConnected(%this) { @@ -93,7 +93,7 @@ function RSSFeedObject::onDisconnect(%this) { // Create collection and load cache. %ret = constructRSSHeadlineCollection(); - %ret.loadFromFile( "RSSCache.cs" ); + %ret.loadFromFile( "RSSCache." @ $TorqueScriptFileExtension ); // Ok, we have a full buffer now, hopefully. Let's process it. //echo(" - Got " @ $RSSFeed::lineCount @ " lines."); @@ -137,7 +137,7 @@ function RSSFeedObject::onDisconnect(%this) eval( %this._callback @ "(" @ %params @ ");" ); } - %ret.writeToFile( "RSSCache.cs", false ); + %ret.writeToFile( "RSSCache." @ $TorqueScriptFileExtension, false ); } function RSSUpdate::initialize( %callback ) diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSStructs.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSStructs.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSStructs.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/RSSNews/RSSStructs.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/contextPopup.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/contextPopup.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/contextPopup.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/contextPopup.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/core/zip/zipFile.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/core/zip/zipFile.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/core/zip/zipFile.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/core/zip/zipFile.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/expandos.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.tscript similarity index 96% rename from Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.tscript index 19456af2c..9d414e453 100644 --- a/Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.cs +++ b/Templates/BaseGame/game/tools/editorClasses/scripts/fileLoader.ed.tscript @@ -23,13 +23,13 @@ function loadDirectory(%path, %type, %dsoType) { if( %type $= "" ) - %type = "ed.cs"; + %type = "ed." @ $TorqueScriptFileExtension; if( %dsoType $= "" ) %dsoType = "edso"; %cspath = %path @ "/*." @ %type; - // Because in a shipping version there will be no .cs files, we can't just + // Because in a shipping version there will be no .tscript files, we can't just // find all the cs files and exec them. // First we find all the scripts and compile them if there are any diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnail.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnail.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnail.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnail.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnailPopup.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnailPopup.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnailPopup.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiClasses/guiThumbnailPopup.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormClass.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormClass.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormClass.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormClass.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormContentManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormContentManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormContentManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormContentManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.tscript similarity index 97% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.tscript index cc449b24c..b5e93d831 100644 --- a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.cs +++ b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLayoutManager.ed.tscript @@ -37,7 +37,7 @@ function GuiFormManager::InitLayouts( %libraryName, %layoutName, %layoutObj ) } // Load up all Layouts in the layout base path. - loadDirectory( %libraryObj.basePath, "cs", "dso" ); + loadDirectory( %libraryObj.basePath, "" @ $TorqueScriptFileExtension, "dso" ); } @@ -77,7 +77,7 @@ function GuiFormManager::RegisterLayout( %libraryName, %layoutName, %layoutObj ) layoutName = %layoutName; layoutLibrary = %libraryObj; layoutObj = %layoutObj; - layoutFile = %libraryObj.basePath @ %layoutName @ ".cs"; + layoutFile = %libraryObj.basePath @ %layoutName @ "." @ $TorqueScriptFileExtension; }; // Tag Layout Object Properly so it can reset itself. @@ -192,7 +192,7 @@ function GuiFormManager::SaveLayout( %library, %layoutName, %newName ) // Do any form layout specifics saving. GuiFormManager::SaveLayoutContent( %layoutObjRef.layoutObj ); - %newFile = %libraryObj.basePath @ "/" @ %newName @ ".cs"; + %newFile = %libraryObj.basePath @ "/" @ %newName @ "." @ $TorqueScriptFileExtension; if( %newName $= "" ) { %newName = %layoutObjRef.layoutName; diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLibraryManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLibraryManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLibraryManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormLibraryManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormMessageManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormMessageManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormMessageManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormMessageManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormReferenceManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/guiFormReferenceManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/guiFormReferenceManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/guiFormReferenceManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/input/applicationEvents.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/input/applicationEvents.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/input/applicationEvents.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/input/applicationEvents.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/input/dragDropEvents.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/input/dragDropEvents.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/input/dragDropEvents.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/input/dragDropEvents.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/input/inputEvents.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/input/inputEvents.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/input/inputEvents.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/input/inputEvents.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/preferencesManager.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/preferencesManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/preferencesManager.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/preferencesManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectEvents.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectEvents.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectEvents.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectEvents.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/projects/projectInternalInterface.ed.tscript diff --git a/Templates/BaseGame/game/tools/editorClasses/scripts/utility.ed.cs b/Templates/BaseGame/game/tools/editorClasses/scripts/utility.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/editorClasses/scripts/utility.ed.cs rename to Templates/BaseGame/game/tools/editorClasses/scripts/utility.ed.tscript diff --git a/Templates/BaseGame/game/tools/forestEditor/brushes.cs b/Templates/BaseGame/game/tools/forestEditor/brushes.tscript similarity index 100% rename from Templates/BaseGame/game/tools/forestEditor/brushes.cs rename to Templates/BaseGame/game/tools/forestEditor/brushes.tscript diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditor.cs b/Templates/BaseGame/game/tools/forestEditor/forestEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/forestEditor/forestEditor.cs rename to Templates/BaseGame/game/tools/forestEditor/forestEditor.tscript diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.cs b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript similarity index 98% rename from Templates/BaseGame/game/tools/forestEditor/forestEditorGui.cs rename to Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript index 5dec48ac0..820689b6a 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.cs +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript @@ -206,7 +206,7 @@ function ForestEditorGui::newMesh( %this ) ForestEditMeshTree.scrollVisible( %item ); ForestEditMeshTree.addSelection( %item ); - ForestDataManager.setDirty( %name, "art/forest/managedItemData.cs" ); + ForestDataManager.setDirty( %name, "art/forest/managedItemData." @ $TorqueScriptFileExtension ); %element = new ForestBrushElement() { @@ -255,7 +255,7 @@ function ForestEditorGui::deleteMesh( %this ) function ForestEditorGui::okDeleteMesh( %this, %mesh ) { // Remove mesh from file - ForestDataManager.removeObjectFromFile( %mesh, "art/forest/managedItemData.cs" ); + ForestDataManager.removeObjectFromFile( %mesh, "art/forest/managedItemData." @ $TorqueScriptFileExtension ); // Submitting undo actions is handled in code. %this.deleteMeshSafe( %mesh ); @@ -371,7 +371,7 @@ function ForestEditMeshTree::onDoubleClick( %this ) parentGroup = ForestBrushGroup; }; - //ForestDataManager.setDirty( %element, "art/forest/brushes.cs" ); + //ForestDataManager.setDirty( %element, "art/forest/brushes." @ $TorqueScriptFileExtension ); ForestEditBrushTree.clearSelection(); ForestEditBrushTree.buildVisibleTree( true ); diff --git a/Templates/BaseGame/game/tools/forestEditor/main.cs b/Templates/BaseGame/game/tools/forestEditor/main.tscript similarity index 93% rename from Templates/BaseGame/game/tools/forestEditor/main.cs rename to Templates/BaseGame/game/tools/forestEditor/main.tscript index 70b6de2fb..99d1bab88 100644 --- a/Templates/BaseGame/game/tools/forestEditor/main.cs +++ b/Templates/BaseGame/game/tools/forestEditor/main.tscript @@ -24,12 +24,12 @@ function initializeForestEditor() { echo(" % - Initializing Forest Editor"); - exec( "./forestEditor.cs" ); + exec( "./forestEditor." @ $TorqueScriptFileExtension ); exec( "./forestEditorGui.gui" ); exec( "./forestEditToolbar.ed.gui" ); - exec( "./forestEditorGui.cs" ); - exec( "./tools.cs" ); + exec( "./forestEditorGui." @ $TorqueScriptFileExtension ); + exec( "./tools." @ $TorqueScriptFileExtension ); ForestEditorGui.setVisible( false ); ForestEditorPalleteWindow.setVisible( false ); @@ -84,16 +84,16 @@ function destroyForestEditor() // NOTE: debugging helper. function reinitForest() { - exec( "./main.cs" ); - exec( "./forestEditorGui.cs" ); - exec( "./tools.cs" ); + exec( "./main." @ $TorqueScriptFileExtension ); + exec( "./forestEditorGui." @ $TorqueScriptFileExtension ); + exec( "./tools." @ $TorqueScriptFileExtension ); } function ForestEditorPlugin::onWorldEditorStartup( %this ) { new PersistenceManager( ForestDataManager ); - %brushPath = "tools/forestEditor/brushes.cs"; + %brushPath = "tools/forestEditor/brushes." @ $TorqueScriptFileExtension; if ( !isFile( %brushPath ) ) %successfulFile = createPath( %brushPath ); @@ -205,7 +205,7 @@ function ForestEditorPlugin::onActivated( %this ) } if ( %this.showError ) - toolsMessageBoxOK( "Error", "Your tools/forestEditor folder does not contain a valid brushes.cs. Brushes you create will not be saved!" ); + toolsMessageBoxOK( "Error", "Your tools/forestEditor folder does not contain a valid brushes." @ $TorqueScriptFileExtension @ ". Brushes you create will not be saved!" ); } function ForestEditorPlugin::onDeactivated( %this ) @@ -262,7 +262,7 @@ function ForestEditorPlugin::onSaveMission( %this, %missionFile ) } } - ForestBrushGroup.save( "tools/forestEditor/brushes.cs" ); + ForestBrushGroup.save( "tools/forestEditor/brushes." @ $TorqueScriptFileExtension ); } function ForestEditorPlugin::onEditorSleep( %this ) diff --git a/Templates/BaseGame/game/tools/forestEditor/tools.cs b/Templates/BaseGame/game/tools/forestEditor/tools.tscript similarity index 100% rename from Templates/BaseGame/game/tools/forestEditor/tools.cs rename to Templates/BaseGame/game/tools/forestEditor/tools.tscript diff --git a/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.cs b/Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.cs rename to Templates/BaseGame/game/tools/gui/GuiEaseEditDlg.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui b/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui index 798153932..a9ba1f768 100644 --- a/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui +++ b/Templates/BaseGame/game/tools/gui/assimpImport.ed.gui @@ -1049,7 +1049,7 @@ }; new GuiCheckBoxCtrl() { useInactiveState = "0"; - text = " Force update materials.cs"; + text = " Force update materials." @ $TorqueScriptFileExtension; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -1063,7 +1063,7 @@ canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Forces update of materials.cs (even if Materials already exist)"; + ToolTip = "Forces update of materials." @ $TorqueScriptFileExtension @ " (even if Materials already exist)"; hovertime = "1000"; internalName = "forceUpdateMaterials"; canSaveDynamicFields = "0"; @@ -1510,4 +1510,4 @@ }; }; //--- OBJECT WRITE END --- -exec("./assimpImport.ed.cs"); +exec("./assimpImport.ed." @ $TorqueScriptFileExtension); diff --git a/Templates/BaseGame/game/tools/gui/assimpImport.ed.cs b/Templates/BaseGame/game/tools/gui/assimpImport.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/gui/assimpImport.ed.cs rename to Templates/BaseGame/game/tools/gui/assimpImport.ed.tscript index 75c0f129e..054e31e51 100644 --- a/Templates/BaseGame/game/tools/gui/assimpImport.ed.cs +++ b/Templates/BaseGame/game/tools/gui/assimpImport.ed.tscript @@ -280,7 +280,7 @@ function AssimpImportDlg::showDialog(%this, %shapePath, %cmd) // Check for an existing TSShapeConstructor object. Need to exec the script // manually as the resource may not have been loaded yet - %csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".cs"; + %csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ "." @ $TorqueScriptFileExtension; if (isFile(%csPath)) exec(%csPath); diff --git a/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui b/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui index bb7c65f48..d098bffe6 100644 --- a/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui +++ b/Templates/BaseGame/game/tools/gui/colladaImport.ed.gui @@ -991,7 +991,7 @@ }; new GuiCheckBoxCtrl() { useInactiveState = "0"; - text = " Force update materials.cs"; + text = " Force update materials." @ $TorqueScriptFileExtension; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -1005,7 +1005,7 @@ canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Forces update of materials.cs (even if Materials already exist)"; + ToolTip = "Forces update of materials." @ $TorqueScriptFileExtension @ " (even if Materials already exist)"; hovertime = "1000"; internalName = "forceUpdateMaterials"; canSaveDynamicFields = "0"; @@ -1255,7 +1255,7 @@ function ColladaImportDlg::showDialog(%this, %shapePath, %cmd) // Check for an existing TSShapeConstructor object. Need to exec the script // manually as the DAE resource may not have been loaded yet - %csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ ".cs"; + %csPath = filePath(%this.path) @ "/" @ fileBase(%this.path) @ "." @ $TorqueScriptFileExtension; if (isFile(%csPath)) exec(%csPath); diff --git a/Templates/BaseGame/game/tools/gui/cursors.ed.cs b/Templates/BaseGame/game/tools/gui/cursors.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/cursors.ed.cs rename to Templates/BaseGame/game/tools/gui/cursors.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs rename to Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index 1e80d3f4d..55842264c 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript @@ -187,7 +187,7 @@ function SettingsInspector::changeEditorSetting(%this, %varName, %value) //Bit of a hack, but if we were editing the theme, reexec the profiles for GUI if(ESettingsWindow.selectedPageText $= "Theme") - exec("tools/gui/profiles.ed.cs"); + exec("tools/gui/profiles.ed." @ $TorqueScriptFileExtension); } else %success = ProjectSettings.write(); diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/assetDependencies.tscript diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/buttonField.tscript diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/fieldTypes.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/fieldTypes.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/fieldTypes.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/fieldTypes.tscript diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/listField.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/listField.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/listField.tscript diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/moduleDependencies.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/moduleDependencies.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/moduleDependencies.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/moduleDependencies.tscript diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/range.cs b/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fieldTypes/range.cs rename to Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript diff --git a/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.cs b/Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/fileDialogBase.ed.cs rename to Templates/BaseGame/game/tools/gui/fileDialogBase.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs b/Templates/BaseGame/game/tools/gui/guiDialogs.ed.tscript similarity index 68% rename from Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs rename to Templates/BaseGame/game/tools/gui/guiDialogs.ed.tscript index 3274b9248..fdb16e1b4 100644 --- a/Templates/BaseGame/game/tools/gui/guiDialogs.ed.cs +++ b/Templates/BaseGame/game/tools/gui/guiDialogs.ed.tscript @@ -20,9 +20,9 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -exec("./fileDialogBase.ed.cs"); -exec("./openFileDialog.ed.cs"); -exec("./saveFileDialog.ed.cs"); +exec("./fileDialogBase.ed." @ $TorqueScriptFileExtension); +exec("./openFileDialog.ed." @ $TorqueScriptFileExtension); +exec("./saveFileDialog.ed." @ $TorqueScriptFileExtension); exec("./saveChangesMBDlg.ed.gui"); exec("./simViewDlg.ed.gui"); exec("./colorPicker.ed.gui"); @@ -30,16 +30,16 @@ exec("./materialSelector.ed.gui"); exec("./scriptEditorDlg.ed.gui"); exec("./colladaImport.ed.gui"); exec("./GuiEaseEditDlg.ed.gui"); -exec("./GuiEaseEditDlg.ed.cs"); -exec("./guiObjectInspector.ed.cs"); +exec("./GuiEaseEditDlg.ed." @ $TorqueScriptFileExtension); +exec("./guiObjectInspector.ed." @ $TorqueScriptFileExtension); exec("./uvEditor.ed.gui"); -exec("./objectSelection.ed.cs"); +exec("./objectSelection.ed." @ $TorqueScriptFileExtension); exec("./postFxManager.gui"); exec("./assimpImport.ed.gui"); -exec("./fieldTypes/assetDependencies.cs"); -exec("./fieldTypes/fieldTypes.cs"); -exec("./fieldTypes/listField.cs"); -exec("./fieldTypes/range.cs"); -exec("./fieldTypes/moduleDependencies.cs"); -exec("./fieldTypes/buttonField.cs"); +exec("./fieldTypes/assetDependencies." @ $TorqueScriptFileExtension); +exec("./fieldTypes/fieldTypes." @ $TorqueScriptFileExtension); +exec("./fieldTypes/listField." @ $TorqueScriptFileExtension); +exec("./fieldTypes/range." @ $TorqueScriptFileExtension); +exec("./fieldTypes/moduleDependencies." @ $TorqueScriptFileExtension); +exec("./fieldTypes/buttonField." @ $TorqueScriptFileExtension); diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.cs b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.cs rename to Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui index 0860a0c44..b3ad85549 100644 --- a/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/materialSelector.ed.gui @@ -1573,7 +1573,7 @@ function MaterialSelector::updateMaterialTags( %this, %material, %tag, %tagValue // their auto-generated or new material if( %material.getFilename() !$= "" && %material.getFilename() !$= "tools/gui/MaterialSelector.ed.gui" && - %material.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs" ) + %material.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension ) { MaterialSelectorPerMan.setDirty( %material ); MaterialSelectorPerMan.saveDirty(); @@ -1761,7 +1761,7 @@ function MaterialSelector::deleteMaterial( %this, %materialName, %secondFilter, if( %materialName.getFilename() !$= "" && %materialName.getFilename() !$= "tools/gui/MaterialSelector.ed.gui" && - %materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs" ) + %materialName.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension ) { MaterialSelectorPerMan.removeObjectFromFile(%materialName); MaterialSelectorPerMan.saveDirty(); diff --git a/Templates/BaseGame/game/tools/gui/messageBoxes/messageBox.ed.cs b/Templates/BaseGame/game/tools/gui/messageBoxes/messageBox.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/messageBoxes/messageBox.ed.cs rename to Templates/BaseGame/game/tools/gui/messageBoxes/messageBox.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/objectSelection.ed.cs b/Templates/BaseGame/game/tools/gui/objectSelection.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/objectSelection.ed.cs rename to Templates/BaseGame/game/tools/gui/objectSelection.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/openFileDialog.ed.cs b/Templates/BaseGame/game/tools/gui/openFileDialog.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/openFileDialog.ed.cs rename to Templates/BaseGame/game/tools/gui/openFileDialog.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/postFxEditor.cs b/Templates/BaseGame/game/tools/gui/postFxEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/postFxEditor.cs rename to Templates/BaseGame/game/tools/gui/postFxEditor.tscript diff --git a/Templates/BaseGame/game/tools/gui/profilerGraph.cs b/Templates/BaseGame/game/tools/gui/profilerGraph.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/profilerGraph.cs rename to Templates/BaseGame/game/tools/gui/profilerGraph.tscript diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.cs b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/gui/profiles.ed.cs rename to Templates/BaseGame/game/tools/gui/profiles.ed.tscript index 93078056c..6e8c7b9ea 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.cs +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -22,7 +22,7 @@ function execEditorProfilesCS() { - exec("./profiles.ed.cs"); + exec("./profiles.ed." @ $TorqueScriptFileExtension); } $Gui::clipboardFile = expandFilename("./clipboard.gui"); @@ -479,7 +479,7 @@ new GuiControlProfile( ToolsGuiScrollProfile ) if( !isObject( ToolsGuiOverlayProfile ) ) new GuiControlProfile( ToolsGuiOverlayProfile ) { - opaque = false; + opaque = true; fillColor = EditorSettings.value("Theme/windowBackgroundColor"); fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextGLColor"); diff --git a/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.cs b/Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.cs rename to Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.tscript diff --git a/Templates/BaseGame/game/tools/gui/saveFileDialog.ed.cs b/Templates/BaseGame/game/tools/gui/saveFileDialog.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/gui/saveFileDialog.ed.cs rename to Templates/BaseGame/game/tools/gui/saveFileDialog.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/main.cs b/Templates/BaseGame/game/tools/guiEditor/main.tscript similarity index 60% rename from Templates/BaseGame/game/tools/guiEditor/main.cs rename to Templates/BaseGame/game/tools/guiEditor/main.tscript index da793b380..f88be5997 100644 --- a/Templates/BaseGame/game/tools/guiEditor/main.cs +++ b/Templates/BaseGame/game/tools/guiEditor/main.tscript @@ -34,22 +34,22 @@ function initializeGuiEditor() // Scripts. - exec( "./scripts/guiEditor.ed.cs" ); - exec( "./scripts/guiEditorTreeView.ed.cs" ); - exec( "./scripts/guiEditorInspector.ed.cs" ); - exec( "./scripts/guiEditorProfiles.ed.cs" ); - exec( "./scripts/guiEditorGroup.ed.cs" ); - exec( "./scripts/guiEditorUndo.ed.cs" ); - exec( "./scripts/guiEditorCanvas.ed.cs" ); - exec( "./scripts/guiEditorContentList.ed.cs" ); - exec( "./scripts/guiEditorStatusBar.ed.cs" ); - exec( "./scripts/guiEditorToolbox.ed.cs" ); - exec( "./scripts/guiEditorSelectDlg.ed.cs" ); + exec( "./scripts/guiEditor.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorTreeView.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorInspector.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorProfiles.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorGroup.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorUndo.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorCanvas.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorContentList.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorStatusBar.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorToolbox.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorSelectDlg.ed." @ $TorqueScriptFileExtension ); - exec( "./scripts/guiEditorNewGuiDialog.ed.cs" ); - exec( "./scripts/fileDialogs.ed.cs" ); - exec( "./scripts/guiEditorPrefsDlg.ed.cs" ); - exec( "./scripts/EditorChooseGUI.ed.cs" ); + exec( "./scripts/guiEditorNewGuiDialog.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/fileDialogs.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/guiEditorPrefsDlg.ed." @ $TorqueScriptFileExtension ); + exec( "./scripts/EditorChooseGUI.ed." @ $TorqueScriptFileExtension ); } function destroyGuiEditor() diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/fileDialogs.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/fileDialogs.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/fileDialogs.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/fileDialogs.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorContentList.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorContentList.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorContentList.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorContentList.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorGroup.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorGroup.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorGroup.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorGroup.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorNewGuiDialog.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorNewGuiDialog.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorNewGuiDialog.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorNewGuiDialog.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorPrefsDlg.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorPrefsDlg.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorPrefsDlg.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorPrefsDlg.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript similarity index 98% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript index 4e977367c..433f103ae 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.cs +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$GUI_EDITOR_DEFAULT_PROFILE_FILENAME = "art/gui/customProfiles.cs"; +$GUI_EDITOR_DEFAULT_PROFILE_FILENAME = "art/gui/customProfiles." @ $TorqueScriptFileExtension; $GUI_EDITOR_DEFAULT_PROFILE_CATEGORY = "Other"; @@ -127,7 +127,7 @@ function GuiEditor::deleteProfile( %this, %profile ) function GuiEditor::showSaveProfileDialog( %this, %currentFileName ) { - getSaveFileName( "TorqueScript Files|*.cs", %this @ ".doSaveProfile", %currentFileName ); + getSaveFileName( "TorqueScript Files|*." @ $TorqueScriptFileExtension, %this @ ".doSaveProfile", %currentFileName ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorSelectDlg.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorSelectDlg.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorSelectDlg.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorSelectDlg.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorStatusBar.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorStatusBar.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorStatusBar.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorStatusBar.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorToolbox.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorToolbox.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorToolbox.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorToolbox.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorTreeView.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorTreeView.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorTreeView.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorTreeView.ed.tscript diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.cs b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.cs rename to Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorUndo.ed.tscript diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.postfxpreset.cs b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.postfxpreset.tscript similarity index 100% rename from Templates/BaseGame/game/tools/levels/DefaultEditorLevel.postfxpreset.cs rename to Templates/BaseGame/game/tools/levels/DefaultEditorLevel.postfxpreset.tscript diff --git a/Templates/BaseGame/game/tools/levels/EditorTemplateLevel.postfxpreset.cs b/Templates/BaseGame/game/tools/levels/EditorTemplateLevel.postfxpreset.tscript similarity index 100% rename from Templates/BaseGame/game/tools/levels/EditorTemplateLevel.postfxpreset.cs rename to Templates/BaseGame/game/tools/levels/EditorTemplateLevel.postfxpreset.tscript diff --git a/Templates/BaseGame/game/tools/main.cs b/Templates/BaseGame/game/tools/main.tscript similarity index 92% rename from Templates/BaseGame/game/tools/main.cs rename to Templates/BaseGame/game/tools/main.tscript index 8c5f31296..8c0cd26a4 100644 --- a/Templates/BaseGame/game/tools/main.cs +++ b/Templates/BaseGame/game/tools/main.tscript @@ -40,9 +40,9 @@ if(!$Tools::loaded) //We may need to lean on certain EditorSettings, and specifically default values if the settings.xml //isn't found - exec("tools/worldEditor/scripts/editorPrefs.ed.cs"); + exec("tools/worldEditor/scripts/editorPrefs.ed." @ $TorqueScriptFileExtension); - exec( "tools/gui/profiles.ed.cs" ); + exec( "tools/gui/profiles.ed." @ $TorqueScriptFileExtension ); exec("tools/gui/EditorLoadingGui.gui"); } @@ -77,14 +77,14 @@ function onStart() } // Common GUI stuff. - exec( "./gui/cursors.ed.cs" ); - exec( "./gui/messageBoxes/messageBox.ed.cs" ); - exec( "./editorClasses/gui/panels/navPanelProfiles.ed.cs" ); + exec( "./gui/cursors.ed." @ $TorqueScriptFileExtension ); + exec( "./gui/messageBoxes/messageBox.ed." @ $TorqueScriptFileExtension ); + exec( "./editorClasses/gui/panels/navPanelProfiles.ed." @ $TorqueScriptFileExtension ); // Make sure we get editor profiles before any GUI's // BUG: these dialogs are needed earlier in the init sequence, and should be moved to // common, along with the guiProfiles they depend on. - exec( "./gui/guiDialogs.ed.cs" ); + exec( "./gui/guiDialogs.ed." @ $TorqueScriptFileExtension ); //%toggle = $Scripts::ignoreDSOs; //$Scripts::ignoreDSOs = true; @@ -98,12 +98,12 @@ function onStart() $editors[%i] = getWord( $Tools::loadFirst, %i ); } - %pattern = $Tools::resourcePath @ "/*/main.cs"; + %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension; %folder = findFirstFile( %pattern ); if ( %folder $= "") { - // if we have absolutely no matches for main.cs, we look for main.cs.dso - %pattern = $Tools::resourcePath @ "/*/main.cs.dso"; + // if we have absolutely no matches for main.tscript, we look for main.tscript.dso + %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso"; %folder = findFirstFile( %pattern ); } while ( %folder !$= "" ) @@ -130,7 +130,7 @@ function onStart() %count = $editors[count]; for ( %i = 0; %i < %count; %i++ ) { - exec( "./" @ $editors[%i] @ "/main.cs" ); + exec( "./" @ $editors[%i] @ "/main." @ $TorqueScriptFileExtension ); %initializeFunction = "initialize" @ $editors[%i]; if( isFunction( %initializeFunction ) ) @@ -355,7 +355,7 @@ function Tools::LoadResources( %path ) for( %i = 0; %i < %wordCount; %i++ ) { %resource = GetField( %resourcesList, %i ); - if( isFile( %resourcesPath @ %resource @ "/resourceDatabase.cs") ) + if( isFile( %resourcesPath @ %resource @ "/resourceDatabase." @ $TorqueScriptFileExtension) ) ResourceObject::load( %path, %resource ); } } diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.cs b/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.cs rename to Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript diff --git a/Templates/BaseGame/game/tools/materialEditor/main.cs b/Templates/BaseGame/game/tools/materialEditor/main.tscript similarity index 94% rename from Templates/BaseGame/game/tools/materialEditor/main.cs rename to Templates/BaseGame/game/tools/materialEditor/main.tscript index 749ea83cf..5bca2fa6f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/main.cs +++ b/Templates/BaseGame/game/tools/materialEditor/main.tscript @@ -36,10 +36,10 @@ function initializeMaterialEditor() exec("~/materialEditor/gui/materialInstancesView.ed.gui"); // Load Client Scripts. - exec("./scripts/materialEditor.ed.cs"); - exec("./scripts/materialEditorUndo.ed.cs"); - exec("./scripts/materialInstanceView.ed.cs"); - //exec("./gui/profiles.ed.cs"); + exec("./scripts/materialEditor.ed." @ $TorqueScriptFileExtension); + exec("./scripts/materialEditorUndo.ed." @ $TorqueScriptFileExtension); + exec("./scripts/materialInstanceView.ed." @ $TorqueScriptFileExtension); + //exec("./gui/profiles.ed." @ $TorqueScriptFileExtension); MaterialEditorPreviewWindow.setVisible( false ); //matEd_cubemapEditor.setVisible( false ); @@ -91,7 +91,7 @@ function MaterialEditorPlugin::onWorldEditorStartup( %this ) MaterialEditorPlugin.map = %map; - MaterialEditorGui.fileSpec = "Torque Material Files (materials.cs)|materials.cs|All Files (*.*)|*.*|"; + MaterialEditorGui.fileSpec = "Torque Material Files (materials." @ $TorqueScriptFileExtension @ ")|materials." @ $TorqueScriptFileExtension @ "|All Files (*.*)|*.*|"; MaterialEditorGui.textureFormats = "Image Files (*.png, *.jpg, *.dds, *.bmp, *.gif, *.jng. *.tga)|*.png;*.jpg;*.dds;*.bmp;*.gif;*.jng;*.tga|All Files (*.*)|*.*|"; MaterialEditorGui.modelFormats = "DTS Files (*.dts)|*.dts"; MaterialEditorGui.lastTexturePath = ""; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs rename to Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index 1b7951190..bcb2b2c29 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -475,7 +475,7 @@ function MaterialEditorGui::isMatEditorMaterial(%this, %material) { return ( %material.getFilename() $= "" || %material.getFilename() $= "tools/gui/materialSelector.ed.gui" || - %material.getFilename() $= "tools/materialEditor/scripts/materialEditor.ed.cs" ); + %material.getFilename() $= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension ); } function MaterialEditorGui::setMaterialNotDirty(%this) @@ -521,13 +521,13 @@ function MaterialEditorGui::setMaterialDirty(%this) %k = %pos + 1; } %savePath = getSubStr( %shapePath , 0 , %k ); - %savePath = %savePath @ "materials.cs"; + %savePath = %savePath @ "materials." @ $TorqueScriptFileExtension; matEd_PersistMan.setDirty(MaterialEditorGui.currentMaterial, %savePath); } else { - matEd_PersistMan.setDirty(MaterialEditorGui.currentMaterial, "art/materials.cs"); + matEd_PersistMan.setDirty(MaterialEditorGui.currentMaterial, "art/materials." @ $TorqueScriptFileExtension); } } else @@ -1840,7 +1840,7 @@ function MaterialEditorGui::createNewCubemap( %this, %cubemap ) parentGroup = RootGroup; }; - matEd_cubemapEdPerMan.setDirty( %cubemap, "art/materials.cs" ); + matEd_cubemapEdPerMan.setDirty( %cubemap, "art/materials." @ $TorqueScriptFileExtension ); matEd_cubemapEdPerMan.saveDirty(); return %cubemap; @@ -1857,7 +1857,7 @@ function MaterialEditorGui::setCubemapDirty(%this) // materials created in the materail selector are given that as its filename, so we run another check if( MaterialEditorGui.isMatEditorMaterial( %cubemap ) ) - matEd_cubemapEdPerMan.setDirty(%cubemap, "art/materials.cs"); + matEd_cubemapEdPerMan.setDirty(%cubemap, "art/materials." @ $TorqueScriptFileExtension); else matEd_cubemapEdPerMan.setDirty(%cubemap); } @@ -2384,7 +2384,7 @@ function MaterialEditorGui::switchMaterial( %this, %material ) and updates the engines libraries accordingly in order to make this change per object/per objects instances/per target. Before this functionality is enacted, there is a popup beforehand that will ask if you are sure if you want to make - this change. Making this change will physically alter possibly two materials.cs + this change. Making this change will physically alter possibly two materials." @ $TorqueScriptFileExtension @ " files in order to move the (%fromMaterial, %toMaterial), replacing the (%fromMaterials)'s mapTo to "unmapped_mat". -------------------------------------------------------------------------------*/ @@ -2424,7 +2424,7 @@ function MaterialEditorGui::changeMaterial(%this, %fromMaterial, %toMaterial) %k = %count + 1; } %fileName = getSubStr( %sourcePath , 0 , %k ); - %fileName = %fileName @ "materials.cs"; + %fileName = %fileName @ "materials." @ $TorqueScriptFileExtension; %action.toMaterialNewFname = %fileName; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.cs b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.tscript similarity index 98% rename from Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.cs rename to Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.tscript index c00d8f70f..4f08ed9e0 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.cs +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditorUndo.ed.tscript @@ -326,7 +326,7 @@ function ActionChangeMaterial::redo(%this) MaterialEditorGui.currentObject = %this.object; if( %this.toMaterial.getFilename() !$= "tools/gui/materialSelector.ed.gui" || - %this.toMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs") + %this.toMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension) { matEd_PersistMan.removeObjectFromFile(%this.toMaterial); } @@ -357,7 +357,7 @@ function ActionChangeMaterial::undo(%this) MaterialEditorGui.currentObject = %this.object; if( %this.toMaterial.getFilename() !$= "tools/gui/materialSelector.ed.gui" || - %this.toMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs") + %this.toMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension) { matEd_PersistMan.removeObjectFromFile(%this.toMaterial); } @@ -442,7 +442,7 @@ function ActionDeleteMaterial::redo(%this) } if( %this.oldMaterial.getFilename() !$= "tools/gui/materialSelector.ed.gui" || - %this.oldMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed.cs") + %this.oldMaterial.getFilename() !$= "tools/materialEditor/scripts/materialEditor.ed." @ $TorqueScriptFileExtension) { matEd_PersistMan.removeObjectFromFile(%this.oldMaterial); } diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialInstanceView.ed.cs b/Templates/BaseGame/game/tools/materialEditor/scripts/materialInstanceView.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/materialEditor/scripts/materialInstanceView.ed.cs rename to Templates/BaseGame/game/tools/materialEditor/scripts/materialInstanceView.ed.tscript diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/main.cs b/Templates/BaseGame/game/tools/meshRoadEditor/main.tscript similarity index 97% rename from Templates/BaseGame/game/tools/meshRoadEditor/main.cs rename to Templates/BaseGame/game/tools/meshRoadEditor/main.tscript index af441d82a..3f5df2c7e 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/main.cs +++ b/Templates/BaseGame/game/tools/meshRoadEditor/main.tscript @@ -23,15 +23,11 @@ function initializeMeshRoadEditor() { echo(" % - Initializing Mesh Road Editor"); - - $MeshRoadEditor::defaultTopMaterialAsset = "Prototyping:FloorGray"; - $MeshRoadEditor::defaultBottomMaterialAsset = "Prototyping:FloorGray"; - $MeshRoadEditor::defaultSideMaterialAsset = "Prototyping:WallOrange"; - exec( "./meshRoadEditor.cs" ); + exec( "./meshRoadEditor." @ $TorqueScriptFileExtension ); exec( "./meshRoadEditorGui.gui" ); exec( "./meshRoadEditorToolbar.gui"); - exec( "./meshRoadEditorGui.cs" ); + exec( "./meshRoadEditorGui." @ $TorqueScriptFileExtension ); MeshRoadEditorGui.setVisible( false ); MeshRoadEditorOptionsWindow.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditor.cs b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditor.cs rename to Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditor.tscript diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.cs b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.cs rename to Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/main.cs b/Templates/BaseGame/game/tools/missionAreaEditor/main.tscript similarity index 97% rename from Templates/BaseGame/game/tools/missionAreaEditor/main.cs rename to Templates/BaseGame/game/tools/missionAreaEditor/main.tscript index f1bc0a745..2fabe6d59 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/main.cs +++ b/Templates/BaseGame/game/tools/missionAreaEditor/main.tscript @@ -24,9 +24,9 @@ function initializeMissionAreaEditor() { echo(" % - Initializing Mission Area Editor"); - exec( "./missionAreaEditor.ed.cs" ); + exec( "./missionAreaEditor.ed." @ $TorqueScriptFileExtension ); exec( "./missionAreaEditorGui.ed.gui" ); - exec( "./missionAreaEditorGui.ed.cs" ); + exec( "./missionAreaEditorGui.ed." @ $TorqueScriptFileExtension ); // Add ourselves to EditorGui, where all the other tools reside MissionAreaEditorGui.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditor.ed.cs b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditor.ed.cs rename to Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.cs b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.cs rename to Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript diff --git a/Templates/BaseGame/game/tools/navEditor/main.cs b/Templates/BaseGame/game/tools/navEditor/main.tscript similarity index 99% rename from Templates/BaseGame/game/tools/navEditor/main.cs rename to Templates/BaseGame/game/tools/navEditor/main.tscript index 12e37a31d..03b0bb2b6 100644 --- a/Templates/BaseGame/game/tools/navEditor/main.cs +++ b/Templates/BaseGame/game/tools/navEditor/main.tscript @@ -34,7 +34,7 @@ function initializeNavEditor() echo(" % - Initializing Navigation Editor"); // Execute all relevant scripts and GUIs. - exec("./navEditor.cs"); + exec("./navEditor." @ $TorqueScriptFileExtension); exec("./NavEditorGui.gui"); exec("./NavEditorToolbar.gui"); exec("./NavEditorConsoleDlg.gui"); diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.cs b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/navEditor/navEditor.cs rename to Templates/BaseGame/game/tools/navEditor/navEditor.tscript diff --git a/Templates/BaseGame/game/tools/particleEditor/main.cs b/Templates/BaseGame/game/tools/particleEditor/main.tscript similarity index 95% rename from Templates/BaseGame/game/tools/particleEditor/main.cs rename to Templates/BaseGame/game/tools/particleEditor/main.tscript index 0283b35c3..d00645623 100644 --- a/Templates/BaseGame/game/tools/particleEditor/main.cs +++ b/Templates/BaseGame/game/tools/particleEditor/main.tscript @@ -30,10 +30,10 @@ function initializeParticleEditor() echo( " % - Initializing Particle Editor" ); exec( "./ParticleEditor.ed.gui" ); - exec( "./particleEditor.ed.cs" ); - exec( "./particleEditorUndo.ed.cs" ); - exec( "./particleEmitterEditor.ed.cs" ); - exec( "./particleParticleEditor.ed.cs" ); + exec( "./particleEditor.ed." @ $TorqueScriptFileExtension ); + exec( "./particleEditorUndo.ed." @ $TorqueScriptFileExtension ); + exec( "./particleEmitterEditor.ed." @ $TorqueScriptFileExtension ); + exec( "./particleParticleEditor.ed." @ $TorqueScriptFileExtension ); PE_Window.setVisible( false ); EditorGui.add( PE_Window ); diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.cs b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.cs rename to Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.cs b/Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.cs rename to Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.tscript index f1e753d5e..80e8588f1 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.cs +++ b/Templates/BaseGame/game/tools/particleEditor/particleEditorUndo.ed.tscript @@ -190,7 +190,7 @@ function ActionDeleteEmitter::redo( %this ) // Remove from file. if( %emitter.getFileName() !$= "" - && %emitter.getFilename() !$= "tools/particleEditor/particleEmitterEditor.ed.cs" ) + && %emitter.getFilename() !$= "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension ) PE_EmitterSaver.removeObjectFromFile( %emitter ); // Select DefaultEmitter or first in list. @@ -449,7 +449,7 @@ function ActionDeleteParticle::redo( %this ) // Remove from file. if( %particle.getFileName() !$= "" - && %particle.getFilename() !$= "tools/particleEditor/particleParticleEditor.ed.cs" ) + && %particle.getFilename() !$= "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension ) PE_ParticleSaver.removeObjectFromFile( %particleId ); // Remove from dropdown. diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.cs b/Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.cs rename to Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.tscript index af2ae06a3..f3825cfe2 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.cs +++ b/Templates/BaseGame/game/tools/particleEditor/particleEmitterEditor.ed.tscript @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData.cs"; +$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData." @ $TorqueScriptFileExtension; //============================================================================================= @@ -500,7 +500,7 @@ function PE_EmitterEditor::setEmitterDirty( %this ) %emitter = PE_EmitterEditor.currEmitter; - if( %emitter.getFilename() $= "" || %emitter.getFilename() $= "tools/particleEditor/particleEmitterEditor.ed.cs" ) + if( %emitter.getFilename() $= "" || %emitter.getFilename() $= "tools/particleEditor/particleEmitterEditor.ed." @ $TorqueScriptFileExtension ) PE_EmitterSaver.setDirty( %emitter, $PE_EMITTEREDITOR_DEFAULT_FILENAME ); else PE_EmitterSaver.setDirty( %emitter ); diff --git a/Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.cs b/Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.cs rename to Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.tscript index ec514a590..2dd764ce7 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.cs +++ b/Templates/BaseGame/game/tools/particleEditor/particleParticleEditor.ed.tscript @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData.cs"; +$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData." @ $TorqueScriptFileExtension; //============================================================================================= @@ -407,7 +407,7 @@ function PE_ParticleEditor::setParticleDirty( %this ) %particle = PE_ParticleEditor.currParticle; - if( %particle.getFilename() $= "" || %particle.getFilename() $= "tools/particleEditor/particleParticleEditor.ed.cs" ) + if( %particle.getFilename() $= "" || %particle.getFilename() $= "tools/particleEditor/particleParticleEditor.ed." @ $TorqueScriptFileExtension ) PE_ParticleSaver.setDirty( %particle, $PE_PARTICLEEDITOR_DEFAULT_FILENAME ); else PE_ParticleSaver.setDirty( %particle ); diff --git a/Templates/BaseGame/game/tools/physicsTools/main.cs b/Templates/BaseGame/game/tools/physicsTools/main.tscript similarity index 100% rename from Templates/BaseGame/game/tools/physicsTools/main.cs rename to Templates/BaseGame/game/tools/physicsTools/main.tscript diff --git a/Templates/BaseGame/game/tools/resources/materials.cs b/Templates/BaseGame/game/tools/resources/materials.tscript similarity index 100% rename from Templates/BaseGame/game/tools/resources/materials.cs rename to Templates/BaseGame/game/tools/resources/materials.tscript diff --git a/Templates/BaseGame/game/tools/riverEditor/main.cs b/Templates/BaseGame/game/tools/riverEditor/main.tscript similarity index 98% rename from Templates/BaseGame/game/tools/riverEditor/main.cs rename to Templates/BaseGame/game/tools/riverEditor/main.tscript index 31680505c..19070038f 100644 --- a/Templates/BaseGame/game/tools/riverEditor/main.cs +++ b/Templates/BaseGame/game/tools/riverEditor/main.tscript @@ -24,10 +24,10 @@ function initializeRiverEditor() { echo(" % - Initializing River Editor"); - exec( "./riverEditor.cs" ); + exec( "./riverEditor." @ $TorqueScriptFileExtension ); exec( "./RiverEditorGui.gui" ); exec( "./RiverEditorToolbar.gui" ); - exec( "./riverEditorGui.cs" ); + exec( "./riverEditorGui." @ $TorqueScriptFileExtension ); // Add ourselves to EditorGui, where all the other tools reside RiverEditorGui.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditor.cs b/Templates/BaseGame/game/tools/riverEditor/riverEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/riverEditor/riverEditor.cs rename to Templates/BaseGame/game/tools/riverEditor/riverEditor.tscript diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.cs b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/riverEditor/riverEditorGui.cs rename to Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/roadEditor/main.cs b/Templates/BaseGame/game/tools/roadEditor/main.tscript similarity index 95% rename from Templates/BaseGame/game/tools/roadEditor/main.cs rename to Templates/BaseGame/game/tools/roadEditor/main.tscript index 9e678fa39..f54976c62 100644 --- a/Templates/BaseGame/game/tools/roadEditor/main.cs +++ b/Templates/BaseGame/game/tools/roadEditor/main.tscript @@ -24,12 +24,10 @@ function initializeRoadEditor() { echo( " - Initializing Road and Path Editor" ); - $DecalRoadEditor::defaultMaterialAsset = "Prototyping:FloorGray"; - - exec( "./roadEditor.cs" ); + exec( "./roadEditor." @ $TorqueScriptFileExtension ); exec( "./RoadEditorGui.gui" ); exec( "./RoadEditorToolbar.gui"); - exec( "./roadEditorGui.cs" ); + exec( "./roadEditorGui." @ $TorqueScriptFileExtension ); // Add ourselves to EditorGui, where all the other tools reside RoadEditorGui.setVisible( false ); @@ -185,7 +183,7 @@ function RoadEditorPlugin::initSettings( %this ) EditorSettings.setDefaultValue( "HoverSplineColor", "255 0 0 255" ); EditorSettings.setDefaultValue( "SelectedSplineColor", "0 255 0 255" ); EditorSettings.setDefaultValue( "HoverNodeColor", "255 255 255 255" ); //<-- Not currently used - EditorSettings.setDefaultValue( "materialAsset", "Prototyping:FloorGray" ); + EditorSettings.setDefaultValue( "MaterialName", "DefaultDecalRoadMaterial" ); EditorSettings.endGroup(); } @@ -198,7 +196,7 @@ function RoadEditorPlugin::readSettings( %this ) RoadEditorGui.HoverSplineColor = EditorSettings.value("HoverSplineColor"); RoadEditorGui.SelectedSplineColor = EditorSettings.value("SelectedSplineColor"); RoadEditorGui.HoverNodeColor = EditorSettings.value("HoverNodeColor"); - RoadEditorGui.materialAsset = EditorSettings.value("materialAsset"); + RoadEditorGui.materialName = EditorSettings.value("MaterialName"); EditorSettings.endGroup(); } @@ -211,7 +209,7 @@ function RoadEditorPlugin::writeSettings( %this ) EditorSettings.setValue( "HoverSplineColor", RoadEditorGui.HoverSplineColor ); EditorSettings.setValue( "SelectedSplineColor", RoadEditorGui.SelectedSplineColor ); EditorSettings.setValue( "HoverNodeColor", RoadEditorGui.HoverNodeColor ); - EditorSettings.setValue( "materialAsset", RoadEditorGui.materialAsset ); + EditorSettings.setValue( "MaterialName", RoadEditorGui.materialName ); EditorSettings.endGroup(); } diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditor.cs b/Templates/BaseGame/game/tools/roadEditor/roadEditor.tscript similarity index 100% rename from Templates/BaseGame/game/tools/roadEditor/roadEditor.cs rename to Templates/BaseGame/game/tools/roadEditor/roadEditor.tscript diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.cs b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript similarity index 100% rename from Templates/BaseGame/game/tools/roadEditor/roadEditorGui.cs rename to Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/Profiles.ed.cs b/Templates/BaseGame/game/tools/shapeEditor/gui/Profiles.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/shapeEditor/gui/Profiles.ed.cs rename to Templates/BaseGame/game/tools/shapeEditor/gui/Profiles.ed.tscript diff --git a/Templates/BaseGame/game/tools/shapeEditor/main.cs b/Templates/BaseGame/game/tools/shapeEditor/main.tscript similarity index 98% rename from Templates/BaseGame/game/tools/shapeEditor/main.cs rename to Templates/BaseGame/game/tools/shapeEditor/main.tscript index 5354c20c3..02ba758a8 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/main.cs +++ b/Templates/BaseGame/game/tools/shapeEditor/main.tscript @@ -28,7 +28,7 @@ function initializeShapeEditor() { echo(" % - Initializing Shape Editor"); - exec("./gui/Profiles.ed.cs"); + exec("./gui/Profiles.ed." @ $TorqueScriptFileExtension); exec("./gui/shapeEdPreviewWindow.ed.gui"); exec("./gui/shapeEdAnimWindow.ed.gui"); @@ -37,9 +37,9 @@ function initializeShapeEditor() exec("./gui/shapeEdSelectWindow.ed.gui"); exec("./gui/shapeEdPropWindow.ed.gui"); - exec("./scripts/shapeEditor.ed.cs"); - exec("./scripts/shapeEditorHints.ed.cs"); - exec("./scripts/shapeEditorActions.ed.cs"); + exec("./scripts/shapeEditor.ed." @ $TorqueScriptFileExtension); + exec("./scripts/shapeEditorHints.ed." @ $TorqueScriptFileExtension); + exec("./scripts/shapeEditorActions.ed." @ $TorqueScriptFileExtension); // Add windows to editor gui ShapeEdPreviewGui.setVisible(false); diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs rename to Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript index 2ec1579ed..6959226c0 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript @@ -253,7 +253,7 @@ function ShapeEditor::createConstructor( %this, %path ) function ShapeEditor::saveConstructor( %this, %constructor ) { - %savepath = filePath( %constructor.baseShape ) @ "/" @ fileBase( %constructor.baseShape ) @ ".cs"; + %savepath = filePath( %constructor.baseShape ) @ "/" @ fileBase( %constructor.baseShape ) @ "." @ $TorqueScriptFileExtension; new PersistenceManager( shapeEd_perMan ); shapeEd_perMan.setDirty( %constructor, %savepath ); shapeEd_perMan.saveDirtyObject( %constructor ); @@ -362,7 +362,7 @@ function ShapeEdShapeTreeView::onSelect( %this, %obj ) } // Find all DTS or COLLADA models. Note: most of this section was shamelessly -// stolen from creater.ed.cs => great work whoever did the original! +// stolen from creater.ed.tscript => great work whoever did the original! function ShapeEdSelectWindow::navigate( %this, %address ) { // Freeze the icon array so it doesn't update until we've added all of the @@ -3041,7 +3041,7 @@ function ShapeEditor::addLODFromFile( %this, %dest, %filename, %size, %allowUnma { // Get (or create) a TSShapeConstructor object for the source shape. Need to // exec the script manually as the resource may not have been loaded yet - %csPath = filePath( %filename ) @ "/" @ fileBase( %filename ) @ ".cs"; + %csPath = filePath( %filename ) @ "/" @ fileBase( %filename ) @ "." @ $TorqueScriptFileExtension; if ( isFile( %csPath ) ) exec( %csPath ); diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorActions.ed.cs b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorActions.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorActions.ed.cs rename to Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorActions.ed.tscript diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorHints.ed.cs b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorHints.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorHints.ed.cs rename to Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditorHints.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.cs b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.cs rename to Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteGroups/init.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.cs b/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/main.cs b/Templates/BaseGame/game/tools/worldEditor/main.tscript similarity index 78% rename from Templates/BaseGame/game/tools/worldEditor/main.cs rename to Templates/BaseGame/game/tools/worldEditor/main.tscript index cdfbbe417..fed24607e 100644 --- a/Templates/BaseGame/game/tools/worldEditor/main.cs +++ b/Templates/BaseGame/game/tools/worldEditor/main.tscript @@ -25,8 +25,8 @@ function initializeWorldEditor() echo(" % - Initializing World Editor"); // Load GUI - exec("./gui/profiles.ed.cs"); - exec("./scripts/cursors.ed.cs"); + exec("./gui/profiles.ed." @ $TorqueScriptFileExtension); + exec("./scripts/cursors.ed." @ $TorqueScriptFileExtension); exec("./gui/guiCreateNewTerrainGui.gui" ); exec("./gui/GenericPromptDialog.ed.gui" ); @@ -51,32 +51,32 @@ function initializeWorldEditor() exec("tools/gui/postFxEditor.gui" ); // Load Scripts. - exec("./scripts/menus.ed.cs"); - exec("./scripts/menuHandlers.ed.cs"); - exec("./scripts/editor.ed.cs"); - exec("./scripts/editorInputCommands.cs"); - exec("./scripts/editor.keybinds.cs"); - exec("./scripts/undoManager.ed.cs"); - exec("./scripts/lighting.ed.cs"); - exec("./scripts/EditorGui.ed.cs"); - exec("./scripts/editorPrefs.ed.cs"); - exec("./scripts/editorRender.ed.cs"); - exec("./scripts/editorPlugin.ed.cs"); - exec("./scripts/EditorChooseLevelGui.ed.cs"); - exec("./scripts/cameraBookmarks.ed.cs"); - exec("./scripts/ManageSFXParametersWindow.ed.cs"); - exec("./scripts/AddFMODProjectDlg.ed.cs"); - exec("./scripts/SelectObjectsWindow.ed.cs"); - exec("./scripts/cameraCommands.ed.cs"); - exec("./scripts/probeBake.ed.cs"); - exec("./scripts/visibility/visibilityLayer.ed.cs"); - exec("./scripts/visibility/lightViz.cs"); - exec("./scripts/visibility/shadowViz.cs"); - exec("./scripts/visibility/probeViz.cs"); - exec("./scripts/visibility/miscViz.cs"); + exec("./scripts/menus.ed." @ $TorqueScriptFileExtension); + exec("./scripts/menuHandlers.ed." @ $TorqueScriptFileExtension); + exec("./scripts/editor.ed." @ $TorqueScriptFileExtension); + exec("./scripts/editorInputCommands." @ $TorqueScriptFileExtension); + exec("./scripts/editor.keybinds." @ $TorqueScriptFileExtension); + exec("./scripts/undoManager.ed." @ $TorqueScriptFileExtension); + exec("./scripts/lighting.ed." @ $TorqueScriptFileExtension); + exec("./scripts/EditorGui.ed." @ $TorqueScriptFileExtension); + exec("./scripts/editorPrefs.ed." @ $TorqueScriptFileExtension); + exec("./scripts/editorRender.ed." @ $TorqueScriptFileExtension); + exec("./scripts/editorPlugin.ed." @ $TorqueScriptFileExtension); + exec("./scripts/EditorChooseLevelGui.ed." @ $TorqueScriptFileExtension); + exec("./scripts/cameraBookmarks.ed." @ $TorqueScriptFileExtension); + exec("./scripts/ManageSFXParametersWindow.ed." @ $TorqueScriptFileExtension); + exec("./scripts/AddFMODProjectDlg.ed." @ $TorqueScriptFileExtension); + exec("./scripts/SelectObjectsWindow.ed." @ $TorqueScriptFileExtension); + exec("./scripts/cameraCommands.ed." @ $TorqueScriptFileExtension); + exec("./scripts/probeBake.ed." @ $TorqueScriptFileExtension); + exec("./scripts/visibility/visibilityLayer.ed." @ $TorqueScriptFileExtension); + exec("./scripts/visibility/lightViz." @ $TorqueScriptFileExtension); + exec("./scripts/visibility/shadowViz." @ $TorqueScriptFileExtension); + exec("./scripts/visibility/probeViz." @ $TorqueScriptFileExtension); + exec("./scripts/visibility/miscViz." @ $TorqueScriptFileExtension); - exec("tools/gui/postFxEditor.cs" ); - exec("tools/gui/renderTargetVisualizer.ed.cs"); + exec("tools/gui/postFxEditor." @ $TorqueScriptFileExtension ); + exec("tools/gui/renderTargetVisualizer.ed." @ $TorqueScriptFileExtension); // Load Custom Editors loadDirectory(expandFilename("./scripts/editors")); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.tscript similarity index 97% rename from Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.tscript index 07c45bd88..1a2494ae1 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/AddFMODProjectDlg.ed.tscript @@ -140,7 +140,7 @@ function AddFMODProjectDlg::onOK( %this ) // If an event script exists from a previous instantiation, // delete it first. - %eventFileName = %fileName @ ".cs"; + %eventFileName = %fileName @ "." @ $TorqueScriptFileExtension; if( isFile( %eventFileName ) ) fileDelete( %eventFileName ); @@ -164,7 +164,7 @@ function AddFMODProjectDlg::onOK( %this ) { // Save the object. - %objName.setFileName( "scripts/client/audioData.cs" ); + %objName.setFileName( "scripts/client/audioData." @ $TorqueScriptFileExtension ); %this.persistenceMgr.setDirty( %objName ); %this.persistenceMgr.saveDirty(); } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorChooseLevelGui.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorChooseLevelGui.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/EditorChooseLevelGui.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/EditorChooseLevelGui.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index dd1693405..ee4e7bfb2 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -38,7 +38,7 @@ function EditorGui::init(%this) if( !isObject( %this-->ToolsPaletteWindow ) ) { // Load Creator/Inspector GUI - exec("~/worldEditor/gui/ToolsPaletteGroups/init.cs"); + exec("~/worldEditor/gui/ToolsPaletteGroups/init." @ $TorqueScriptFileExtension); exec("~/worldEditor/gui/ToolsPaletteWindow.ed.gui"); if( isObject( EWToolsPaletteWindow ) ) @@ -157,7 +157,7 @@ function EditorGui::init(%this) if( !isObject( %this-->EditorSettingsWindow ) ) { exec("tools/gui/EditorSettingsWindow.ed.gui"); - exec("tools/gui/editorSettingsWindow.ed.cs"); + exec("tools/gui/editorSettingsWindow.ed." @ $TorqueScriptFileExtension); %this.add( ESettingsWindow ); ESettingsWindow.setVisible(false); @@ -178,7 +178,7 @@ function EditorGui::init(%this) if( !isObject( %this-->SnapOptionsWindow ) ) { exec("~/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui"); - exec("~/worldEditor/scripts/objectSnapOptions.ed.cs"); + exec("~/worldEditor/scripts/objectSnapOptions.ed." @ $TorqueScriptFileExtension); %this.add( ESnapOptions ); ESnapOptions.setVisible(false); ESnapOptionsTabBook.selectPage(0); @@ -188,7 +188,7 @@ function EditorGui::init(%this) if( !isObject( %this-->TransformSelectionWindow ) ) { exec("~/worldEditor/gui/TransformSelectionWindow.ed.gui"); - exec("~/worldEditor/scripts/transformSelection.ed.cs"); + exec("~/worldEditor/scripts/transformSelection.ed." @ $TorqueScriptFileExtension); %this.add( ETransformSelection ); ETransformSelection.setVisible(false); } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript index 131551af9..f788c7edb 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/ManageSFXParametersWindow.ed.tscript @@ -26,7 +26,7 @@ //============================================================================= /// File to save newly created SFXParameters in by default. -$SFX_PARAMETER_FILE = "scripts/client/audioData.cs"; +$SFX_PARAMETER_FILE = "scripts/client/audioData." @ $TorqueScriptFileExtension; $SFX_PARAMETER_CHANNELS[ 0 ] = "Volume"; $SFX_PARAMETER_CHANNELS[ 1 ] = "Pitch"; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/SelectObjectsWindow.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/SelectObjectsWindow.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/SelectObjectsWindow.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/SelectObjectsWindow.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/cameraBookmarks.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/cameraBookmarks.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/cameraBookmarks.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/cameraBookmarks.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/cameraCommands.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/cameraCommands.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/cameraCommands.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/cameraCommands.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/cursors.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/cursors.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/cursors.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/cursors.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.bind.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.bind.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editor.bind.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editor.bind.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.tscript index 1a05008eb..26c9dd1e7 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.tscript @@ -163,7 +163,7 @@ function toggleEditor(%make) } //------------------------------------------------------------------------------ -// The editor action maps are defined in editor.bind.cs +// The editor action maps are defined in editor.bind.tscript GlobalActionMap.bind(keyboard, "f11", fastLoadWorldEdit); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorInputCommands.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editorInputCommands.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editorInputCommands.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editorInputCommands.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.tscript similarity index 97% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.tscript index 7bafa3838..5e12dbb32 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editorPlugin.ed.tscript @@ -40,9 +40,9 @@ /// /// EditorPlugin::register( %obj ); /// -/// For an a full example see: tools/roadEditor/main.cs -/// or: tools/riverEditor/main.cs -/// or: tools/decalEditor/main.cs +/// For an a full example see: tools/roadEditor/main.tscript +/// or: tools/riverEditor/main.tscript +/// or: tools/decalEditor/main.tscript /// /// It is not intended for the user to overload this method. diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorRender.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editorRender.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editorRender.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editorRender.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorSettingsWindow.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editorSettingsWindow.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editorSettingsWindow.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editorSettingsWindow.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/missionArea.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/missionArea.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editors/missionArea.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editors/missionArea.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/levelInfoEditor.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/levelInfoEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/levelInfoEditor.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/levelInfoEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/simObjectEditor.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/simObjectEditor.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/simObjectEditor.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/simObjectEditor.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript similarity index 99% rename from Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript index ca6a04d91..e817f61bf 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript @@ -340,10 +340,10 @@ function TerrainMaterialDlg::newMat( %this ) internalName = %matName; parentGroup = TerrainMaterialDlgNewGroup; }; - %newMat.setFileName( "art/terrains/materials.cs" ); + %newMat.setFileName( "art/terrains/materials." @ $TorqueScriptFileExtension ); // Mark it as dirty and to be saved in the default location. - ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials.cs" );*/ + ETerrainMaterialPersistMan.setDirty( %newMat, "art/terrains/materials." @ $TorqueScriptFileExtension );*/ %scene = getRootScene(); %path = filePath(%scene.getFilename()); @@ -591,7 +591,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat ) { error("TerrainMaterialDlg::saveDirtyMaterial() - terrain material doesn't have a fileName set to save to."); return; - //%fileName = "data/terrains/materials.cs"; + //%fileName = "data/terrains/materials." @ $TorqueScriptFileExtension; } ETerrainMaterialPersistMan.setDirty( %mat, %fileName ); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainTextureSettingsDlg.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainTextureSettingsDlg.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainTextureSettingsDlg.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainTextureSettingsDlg.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/lighting.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/objectSnapOptions.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/objectSnapOptions.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/objectSnapOptions.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/objectSnapOptions.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/probeBake.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/probeBake.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/probeBake.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/probeBake.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/transformSelection.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/transformSelection.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/transformSelection.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/transformSelection.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/undoManager.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/undoManager.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/undoManager.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/undoManager.ed.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/lightViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/lightViz.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/visibility/lightViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/visibility/lightViz.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/probeViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/probeViz.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/visibility/probeViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/visibility/probeViz.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shadowViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shadowViz.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shadowViz.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shadowViz.tscript diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/visibilityLayer.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/visibilityLayer.ed.tscript similarity index 100% rename from Templates/BaseGame/game/tools/worldEditor/scripts/visibility/visibilityLayer.ed.cs rename to Templates/BaseGame/game/tools/worldEditor/scripts/visibility/visibilityLayer.ed.tscript diff --git a/Templates/Modules/Verve/Verve.cs b/Templates/Modules/Verve/Verve.cs deleted file mode 100644 index 61b8b4ab6..000000000 --- a/Templates/Modules/Verve/Verve.cs +++ /dev/null @@ -1,19 +0,0 @@ -function Verve::create( %this ) -{ - exec("data/Verve/gui/verveCinematic.gui"); - - exec("data/Verve/scripts/server/verveCinematicController.cs"); - exec("data/Verve/scripts/server/verveCinematicTrigger.cs"); - exec("data/Verve/scripts/server/vervePathTutorialData.cs"); - - if(isObject(DatablockFilesList)) - { - DatablockFilesList.add( "data/Verve/scripts/datablocks/verve/VerveActorData.cs" ); - DatablockFilesList.add( "data/Verve/scripts/datablocks/verve/VervePathTutorialData.cs" ); - } -} - -function Verve::destroy( %this ) -{ - -} \ No newline at end of file diff --git a/Templates/Modules/Verve/Verve.module b/Templates/Modules/Verve/Verve.module index 00e86707c..0806f0543 100644 --- a/Templates/Modules/Verve/Verve.module +++ b/Templates/Modules/Verve/Verve.module @@ -2,7 +2,7 @@ ModuleId="Verve" VersionId="1" Description="Module that implements Verve." - ScriptFile="Verve.cs" + ScriptFile="Verve" CreateFunction="create" DestroyFunction="destroy" Group="Game"> diff --git a/Templates/Modules/Verve/Verve.tscript b/Templates/Modules/Verve/Verve.tscript new file mode 100644 index 000000000..8af7b656f --- /dev/null +++ b/Templates/Modules/Verve/Verve.tscript @@ -0,0 +1,19 @@ +function Verve::create( %this ) +{ + exec("data/Verve/gui/verveCinematic.gui"); + + exec("data/Verve/scripts/server/verveCinematicController." @ $TorqueScriptFileExtension); + exec("data/Verve/scripts/server/verveCinematicTrigger." @ $TorqueScriptFileExtension); + exec("data/Verve/scripts/server/vervePathTutorialData." @ $TorqueScriptFileExtension); + + if(isObject(DatablockFilesList)) + { + DatablockFilesList.add( "data/Verve/scripts/datablocks/verve/VerveActorData." @ $TorqueScriptFileExtension ); + DatablockFilesList.add( "data/Verve/scripts/datablocks/verve/VervePathTutorialData." @ $TorqueScriptFileExtension ); + } +} + +function Verve::destroy( %this ) +{ + +} \ No newline at end of file diff --git a/Templates/Modules/Verve/art/shapes/VervePathTutorial/materials.cs b/Templates/Modules/Verve/art/shapes/VervePathTutorial/materials.tscript similarity index 100% rename from Templates/Modules/Verve/art/shapes/VervePathTutorial/materials.cs rename to Templates/Modules/Verve/art/shapes/VervePathTutorial/materials.tscript diff --git a/Templates/Modules/Verve/scripts/datablocks/datablockExec.cs b/Templates/Modules/Verve/scripts/datablocks/datablockExec.tscript similarity index 62% rename from Templates/Modules/Verve/scripts/datablocks/datablockExec.cs rename to Templates/Modules/Verve/scripts/datablocks/datablockExec.tscript index d85bb690d..9061bcb72 100644 --- a/Templates/Modules/Verve/scripts/datablocks/datablockExec.cs +++ b/Templates/Modules/Verve/scripts/datablocks/datablockExec.tscript @@ -24,45 +24,45 @@ // a server is constructed. // Do the sounds first -- later scripts/datablocks may need them -exec("./audioProfiles.cs"); +exec("./audioProfiles." @ $TorqueScriptFileExtension); // LightFlareData and LightAnimData(s) -exec("./lights.cs"); +exec("./lights." @ $TorqueScriptFileExtension); // Do the various effects next -- later scripts/datablocks may need them -exec("./particles.cs"); -exec("./environment.cs"); +exec("./particles." @ $TorqueScriptFileExtension); +exec("./environment." @ $TorqueScriptFileExtension); -exec("./triggers.cs"); +exec("./triggers." @ $TorqueScriptFileExtension); // Add a rigid example -exec("./rigidShape.cs"); +exec("./rigidShape." @ $TorqueScriptFileExtension); -exec("./health.cs"); +exec("./health." @ $TorqueScriptFileExtension); // Load our supporting weapon datablocks, effects and such. They must be // loaded before any weapon that uses them. -exec("./weapon.cs"); -exec("./weapons/grenadefx.cs"); -exec("./weapons/rocketfx.cs"); +exec("./weapon." @ $TorqueScriptFileExtension); +exec("./weapons/grenadefx." @ $TorqueScriptFileExtension); +exec("./weapons/rocketfx." @ $TorqueScriptFileExtension); // Load the weapon datablocks -exec("./weapons/Lurker.cs"); -exec("./weapons/Ryder.cs"); -exec("./weapons/ProxMine.cs"); -exec("./weapons/Turret.cs"); +exec("./weapons/Lurker." @ $TorqueScriptFileExtension); +exec("./weapons/Ryder." @ $TorqueScriptFileExtension); +exec("./weapons/ProxMine." @ $TorqueScriptFileExtension); +exec("./weapons/Turret." @ $TorqueScriptFileExtension); -exec("./teleporter.cs"); +exec("./teleporter." @ $TorqueScriptFileExtension); // Load the default player datablocks -exec("./player.cs"); +exec("./player." @ $TorqueScriptFileExtension); // Load our other player datablocks -exec("./aiPlayer.cs"); +exec("./aiPlayer." @ $TorqueScriptFileExtension); // Load the vehicle datablocks -exec("./vehicles/cheetahCar.cs"); +exec("./vehicles/cheetahCar." @ $TorqueScriptFileExtension); // Load Verve Data. -exec("./verve/VerveActorData.cs"); -exec("./verve/VervePathTutorialData.cs"); \ No newline at end of file +exec("./verve/VerveActorData." @ $TorqueScriptFileExtension); +exec("./verve/VervePathTutorialData." @ $TorqueScriptFileExtension); \ No newline at end of file diff --git a/Templates/Modules/Verve/scripts/datablocks/verve/VerveActorData.cs b/Templates/Modules/Verve/scripts/datablocks/verve/VerveActorData.tscript similarity index 100% rename from Templates/Modules/Verve/scripts/datablocks/verve/VerveActorData.cs rename to Templates/Modules/Verve/scripts/datablocks/verve/VerveActorData.tscript diff --git a/Templates/Modules/Verve/scripts/datablocks/verve/VervePathTutorialData.cs b/Templates/Modules/Verve/scripts/datablocks/verve/VervePathTutorialData.tscript similarity index 100% rename from Templates/Modules/Verve/scripts/datablocks/verve/VervePathTutorialData.cs rename to Templates/Modules/Verve/scripts/datablocks/verve/VervePathTutorialData.tscript diff --git a/Templates/Modules/Verve/scripts/server/VerveCinematicController.cs b/Templates/Modules/Verve/scripts/server/VerveCinematicController.tscript similarity index 100% rename from Templates/Modules/Verve/scripts/server/VerveCinematicController.cs rename to Templates/Modules/Verve/scripts/server/VerveCinematicController.tscript diff --git a/Templates/Modules/Verve/scripts/server/VerveCinematicTrigger.cs b/Templates/Modules/Verve/scripts/server/VerveCinematicTrigger.tscript similarity index 100% rename from Templates/Modules/Verve/scripts/server/VerveCinematicTrigger.cs rename to Templates/Modules/Verve/scripts/server/VerveCinematicTrigger.tscript diff --git a/Templates/Modules/Verve/scripts/server/VervePathTutorialData.cs b/Templates/Modules/Verve/scripts/server/VervePathTutorialData.tscript similarity index 100% rename from Templates/Modules/Verve/scripts/server/VervePathTutorialData.cs rename to Templates/Modules/Verve/scripts/server/VervePathTutorialData.tscript diff --git a/Templates/Modules/inputTest/inputTest.module b/Templates/Modules/inputTest/inputTest.module index 270acaa1c..fb81c3ad1 100644 --- a/Templates/Modules/inputTest/inputTest.module +++ b/Templates/Modules/inputTest/inputTest.module @@ -2,7 +2,7 @@ ModuleId="inputTest" VersionId="1" Description="Input Monitor Module." - ScriptFile="inputTest.cs" + ScriptFile="inputTest" CreateFunction="create" DestroyFunction="destroy" Group="Game" diff --git a/Templates/Modules/inputTest/inputTest.cs b/Templates/Modules/inputTest/inputTest.tscript similarity index 83% rename from Templates/Modules/inputTest/inputTest.cs rename to Templates/Modules/inputTest/inputTest.tscript index 231a43e03..7dad50618 100644 --- a/Templates/Modules/inputTest/inputTest.cs +++ b/Templates/Modules/inputTest/inputTest.tscript @@ -13,12 +13,12 @@ function inputTest::destroy( %this ) function inputTest::initClient( %this ) { - %this.queueExec("/scripts/customProfiles.cs"); - %this.queueExec("/scripts/inputMonitor.cs"); + %this.queueExec("/scripts/customProfiles." @ $TorqueScriptFileExtension); + %this.queueExec("/scripts/inputMonitor." @ $TorqueScriptFileExtension); %this.queueExec("/scripts/gui/inputMonitor.gui"); - %this.queueExec("/scripts/joystickSettings.cs"); + %this.queueExec("/scripts/joystickSettings." @ $TorqueScriptFileExtension); %this.queueExec("/scripts/gui/joystickSettings.gui"); - %this.queueExec("/scripts/menuButtons.cs"); + %this.queueExec("/scripts/menuButtons." @ $TorqueScriptFileExtension); } function onSDLDeviceConnected(%sdlIndex, %deviceName, %deviceType) diff --git a/Templates/Modules/inputTest/scripts/customProfiles.cs b/Templates/Modules/inputTest/scripts/customProfiles.tscript similarity index 100% rename from Templates/Modules/inputTest/scripts/customProfiles.cs rename to Templates/Modules/inputTest/scripts/customProfiles.tscript diff --git a/Templates/Modules/inputTest/scripts/inputMonitor.cs b/Templates/Modules/inputTest/scripts/inputMonitor.tscript similarity index 100% rename from Templates/Modules/inputTest/scripts/inputMonitor.cs rename to Templates/Modules/inputTest/scripts/inputMonitor.tscript diff --git a/Templates/Modules/inputTest/scripts/joystickSettings.cs b/Templates/Modules/inputTest/scripts/joystickSettings.tscript similarity index 100% rename from Templates/Modules/inputTest/scripts/joystickSettings.cs rename to Templates/Modules/inputTest/scripts/joystickSettings.tscript diff --git a/Templates/Modules/inputTest/scripts/menuButtons.cs b/Templates/Modules/inputTest/scripts/menuButtons.tscript similarity index 100% rename from Templates/Modules/inputTest/scripts/menuButtons.cs rename to Templates/Modules/inputTest/scripts/menuButtons.tscript diff --git a/Templates/Modules/vr/VR.module b/Templates/Modules/vr/VR.module index 14ccec0e0..04e9cde22 100644 --- a/Templates/Modules/vr/VR.module +++ b/Templates/Modules/vr/VR.module @@ -2,7 +2,7 @@ ModuleId="VR" VersionId="1" Description="Module that implements the core engine-level setup for the game." - ScriptFile="VR.cs" + ScriptFile="VR" CreateFunction="onCreate" DestroyFunction="onDestroy" Group="Game"> diff --git a/Templates/Modules/vr/VR.cs b/Templates/Modules/vr/VR.tscript similarity index 52% rename from Templates/Modules/vr/VR.cs rename to Templates/Modules/vr/VR.tscript index ea0ffd7a5..2a7522dfc 100644 --- a/Templates/Modules/vr/VR.cs +++ b/Templates/Modules/vr/VR.tscript @@ -1,7 +1,7 @@ function VR::onCreate(%this) { - exec("./scripts/oculusVR.cs"); + exec("./scripts/oculusVR." @ $TorqueScriptFileExtension); } function VR::onDestroy(%this) diff --git a/Templates/Modules/vr/scripts/oculusVR.cs b/Templates/Modules/vr/scripts/oculusVR.tscript similarity index 100% rename from Templates/Modules/vr/scripts/oculusVR.cs rename to Templates/Modules/vr/scripts/oculusVR.tscript diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index e954524ba..2711bd8a4 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -199,6 +199,12 @@ mark_as_advanced(TORQUE_DEBUG_GFX_MODE) #option(DEBUG_SPEW "more debug" OFF) set(TORQUE_NO_DSO_GENERATION ON) +if(NOT TORQUE_SCRIPT_EXTENSION) + set(TORQUE_SCRIPT_EXTENSION "tscript" CACHE STRING "The default script extension to use for TorqueScript files") +endif() + +mark_as_advanced(TORQUE_SCRIPT_EXTENSION) + option(TORQUE_USE_ZENITY "use the Zenity backend for NFD" OFF) mark_as_advanced(TORQUE_USE_ZENITY) @@ -641,8 +647,8 @@ endif() if(NOT EXISTS "${projectOutDir}/${PROJECT_NAME}.torsion") CONFIGURE_FILE("${cmakeDir}/template.torsion.in" "${projectOutDir}/${PROJECT_NAME}.torsion") endif() -if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in") - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.cs.in" "${projectOutDir}/main.cs") +if(EXISTS "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.${TORQUE_SCRIPT_EXTENSION}.in") + CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/game/main.${TORQUE_SCRIPT_EXTENSION}.in" "${projectOutDir}/main.${TORQUE_SCRIPT_EXTENSION}") endif() if(WIN32) if(NOT EXISTS "${projectSrcDir}/torque.rc") diff --git a/Tools/CMake/torqueConfig.h.in b/Tools/CMake/torqueConfig.h.in index 6047bf1d9..8e33624b3 100644 --- a/Tools/CMake/torqueConfig.h.in +++ b/Tools/CMake/torqueConfig.h.in @@ -66,6 +66,9 @@ /// Define me if you don't want Torque to compile dso's #cmakedefine TORQUE_NO_DSO_GENERATION +/// Define the default extension to be used for TorqueScript files +#cmakedefine TORQUE_SCRIPT_EXTENSION "@TORQUE_SCRIPT_EXTENSION@" + // Define me if this build is a tools build #cmakedefine TORQUE_PLAYER #cmakedefine TORQUE_TOOLS