rw-parser-ng 2.0.1 → 2.0.3

package/lib/{src/index.d.ts → index.d.ts}

@@ -6,3 +6,4 @@ export * from './renderware/txd/TxdParser';
 export * from './renderware/ifp/IfpParser';
 export * from './renderware/dff/DffModelType';
 export * from './renderware/ifp/IfpData';
+export * from './renderware/common/types';

package/lib/{src/index.js → index.js}

@@ -26,3 +26,4 @@ __exportStar(require("./renderware/txd/TxdParser"), exports);
 __exportStar(require("./renderware/ifp/IfpParser"), exports);
 __exportStar(require("./renderware/dff/DffModelType"), exports);
 __exportStar(require("./renderware/ifp/IfpData"), exports);
+__exportStar(require("./renderware/common/types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rw-parser-ng",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Parses RenderWare DFF, TXD and IFP files into usable format!",
   "author": {
     "name": "DepsCian",
@@ -50,8 +50,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "prepare": "npm run build",
-    "test": "jest",
-    "sort:models": "tsc && node lib/scripts/sort_models.js"
+    "test": "jest"
   },
   "files": [
     "lib",

package/src/index.ts

@@ -8,3 +8,4 @@ export * from './renderware/ifp/IfpParser';
 
 export * from './renderware/dff/DffModelType';
 export * from './renderware/ifp/IfpData';
+export * from './renderware/common/types';

package/tsconfig.json

@@ -11,8 +11,8 @@
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "./lib/",                      /* Redirect output structure to the directory. */
-    // "rootDir": "./src/",                      /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    "outDir": "./lib",                        /* Redirect output structure to the directory. */
+    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                     /* Enable project compilation */
     // "removeComments": true,                /* Do not emit comments to output. */
     // "noEmit": true,                        /* Do not emit outputs. */
@@ -58,8 +58,7 @@
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
   "include": [
-    "src/**/*",
-    "scripts/**/*"
+    "src/**/*"
   ],
   "exclude": [
     "node_modules",

package/lib/scripts/sort_models.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/scripts/sort_models.js

@@ -1,185 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-var worker_threads_1 = require("worker_threads");
-var index_1 = require("../src/index");
-var fs_1 = require("fs");
-var path = __importStar(require("path"));
-var os = __importStar(require("os"));
-var sourceDir = 'C:\\Users\\Administrator\\Documents\\Code\\playground-render\\assets\\source_skins';
-var outputDir = 'C:\\Users\\Administrator\\Documents\\Code\\playground-render\\assets\\sorted_skins';
-var modelTypeToDir = (_a = {},
-    _a[index_1.DffModelType.GENERIC] = 'objects',
-    _a[index_1.DffModelType.SKIN] = 'skins',
-    _a[index_1.DffModelType.VEHICLE] = 'vehicles',
-    _a);
-function createDirectory(dir) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, fs_1.promises.mkdir(dir, { recursive: true })];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-function sortAndIndexAssets() {
-    return __awaiter(this, void 0, void 0, function () {
-        var texturesDir, modelDirs, allFiles, filesQueue, numWorkers, modelIndex, textureIndex, processedFiles, runWorker, workerPromises, i;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    console.time('Total execution time');
-                    texturesDir = path.join(outputDir, 'textures');
-                    modelDirs = Object.values(modelTypeToDir).map(function (dir) { return path.join(outputDir, dir); });
-                    return [4 /*yield*/, Promise.all(__spreadArray([createDirectory(texturesDir)], modelDirs.map(createDirectory), true))];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, fs_1.promises.readdir(sourceDir)];
-                case 2:
-                    allFiles = (_a.sent()).filter(function (f) { return ['.dff', '.txd'].includes(path.extname(f).toLowerCase()); });
-                    filesQueue = __spreadArray([], allFiles, true);
-                    numWorkers = os.cpus().length;
-                    console.log("Starting processing with ".concat(numWorkers, " workers for ").concat(allFiles.length, " files."));
-                    modelIndex = { skins: [], objects: [], vehicles: [] };
-                    textureIndex = {};
-                    processedFiles = 0;
-                    runWorker = function (workerId) { return new Promise(function (resolve, reject) {
-                        var worker = new worker_threads_1.Worker(path.join(__dirname, 'sort_worker.js'));
-                        worker.on('message', function (result) {
-                            processedFiles++;
-                            process.stdout.write("\rProcessing: ".concat(processedFiles, "/").concat(allFiles.length));
-                            if (result.type === 'dff') {
-                                modelIndex[result.category].push(result.file);
-                            }
-                            else if (result.type === 'txd') {
-                                textureIndex[result.file] = result.textures;
-                            }
-                            else if (result.type === 'error') {
-                                console.error("\n[Worker ".concat(workerId, "] Error processing ").concat(result.file, ": ").concat(result.message));
-                            }
-                            if (filesQueue.length > 0) {
-                                worker.postMessage({ file: filesQueue.pop(), sourceDir: sourceDir, outputDir: outputDir, texturesDir: texturesDir, modelTypeToDir: modelTypeToDir });
-                            }
-                            else {
-                                worker.postMessage(null);
-                            }
-                        });
-                        worker.on('error', reject);
-                        worker.on('exit', function (code) {
-                            if (code === 0) {
-                                resolve();
-                            }
-                            else {
-                                reject(new Error("Worker ".concat(workerId, " stopped with exit code ").concat(code)));
-                            }
-                        });
-                        if (filesQueue.length > 0) {
-                            worker.postMessage({ file: filesQueue.pop(), sourceDir: sourceDir, outputDir: outputDir, texturesDir: texturesDir, modelTypeToDir: modelTypeToDir });
-                        }
-                        else {
-                            worker.postMessage(null);
-                        }
-                    }); };
-                    workerPromises = [];
-                    for (i = 0; i < numWorkers; i++) {
-                        workerPromises.push(runWorker(i + 1));
-                    }
-                    return [4 /*yield*/, Promise.all(workerPromises)];
-                case 3:
-                    _a.sent();
-                    console.log('\nWriting index files...');
-                    return [4 /*yield*/, Promise.all([
-                            fs_1.promises.writeFile(path.join(outputDir, 'index.json'), JSON.stringify(modelIndex, null, 2)),
-                            fs_1.promises.writeFile(path.join(texturesDir, 'index.json'), JSON.stringify(textureIndex, null, 2))
-                        ])];
-                case 4:
-                    _a.sent();
-                    console.log('Sorting and indexing complete!');
-                    console.timeEnd('Total execution time');
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-sortAndIndexAssets().catch(console.error);

package/lib/scripts/sort_worker.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/scripts/sort_worker.js

@@ -1,140 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var worker_threads_1 = require("worker_threads");
-var index_1 = require("../src/index");
-var fs_1 = require("fs");
-var path = __importStar(require("path"));
-if (!worker_threads_1.parentPort) {
-    throw new Error('This script must be run as a worker thread.');
-}
-function processFile(task) {
-    return __awaiter(this, void 0, void 0, function () {
-        var file, sourceDir, outputDir, texturesDir, modelTypeToDir, sourcePath, ext, dffBuffer, modelType, targetDirName, destPath, destPath, txdBuffer, textureDictionary, textureNames, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    file = task.file, sourceDir = task.sourceDir, outputDir = task.outputDir, texturesDir = task.texturesDir, modelTypeToDir = task.modelTypeToDir;
-                    sourcePath = path.join(sourceDir, file);
-                    ext = path.extname(file).toLowerCase();
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 8, , 9]);
-                    if (!(ext === '.dff')) return [3 /*break*/, 4];
-                    return [4 /*yield*/, fs_1.promises.readFile(sourcePath)];
-                case 2:
-                    dffBuffer = _a.sent();
-                    modelType = new index_1.DffParser(dffBuffer).parse().modelType;
-                    targetDirName = modelTypeToDir[modelType];
-                    destPath = path.join(outputDir, targetDirName, file);
-                    return [4 /*yield*/, fs_1.promises.copyFile(sourcePath, destPath)];
-                case 3:
-                    _a.sent();
-                    return [2 /*return*/, { type: 'dff', file: file, category: targetDirName }];
-                case 4:
-                    if (!(ext === '.txd')) return [3 /*break*/, 7];
-                    destPath = path.join(texturesDir, file);
-                    return [4 /*yield*/, fs_1.promises.copyFile(sourcePath, destPath)];
-                case 5:
-                    _a.sent();
-                    return [4 /*yield*/, fs_1.promises.readFile(sourcePath)];
-                case 6:
-                    txdBuffer = _a.sent();
-                    textureDictionary = new index_1.TxdParser(txdBuffer).parse().textureDictionary;
-                    textureNames = textureDictionary.textureNatives.map(function (t) { return t.textureName; });
-                    return [2 /*return*/, { type: 'txd', file: file, textures: textureNames }];
-                case 7: return [3 /*break*/, 9];
-                case 8:
-                    error_1 = _a.sent();
-                    return [2 /*return*/, { type: 'error', file: file, message: error_1.message }];
-                case 9: return [2 /*return*/];
-            }
-        });
-    });
-}
-worker_threads_1.parentPort.on('message', function (task) { return __awaiter(void 0, void 0, void 0, function () {
-    var result;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (task === null) {
-                    process.exit(0);
-                }
-                return [4 /*yield*/, processFile(task)];
-            case 1:
-                result = _a.sent();
-                if (result) {
-                    worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage(result);
-                }
-                return [2 /*return*/];
-        }
-    });
-}); });