scuti/reflex2q3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Renamed .ent to .rem - Reflex Entity Mapping file to avoid confusion

Browse Source
This commit is contained in:
surkeh 2017-08-28 18:24:00 -07:00
parent fc711448d8
commit f88a4710f0
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -17,10 +17,10 @@ Converts Reflex maps (Version 8 and below) into id Tech map files. A pre-compil
####Convert map geometry and entities: ####Convert map geometry and entities:
```bash ```bash
./reflex2q3 [input].map [output].map -e [entity file].ent ./reflex2q3 [input].map [output].map -e [entity file].rem
``` ```
We've provided Quake 3 and Xonotic entity conversion files (r2q3.ent and r2xonotic.ent). To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://git.teknik.io/scuti/reflex2q3/src/f2b0341da38b82ad4f0a0cf258b0f6e6d8335fda/docs/doc-entities.txt), our sample .ent files, and relevant documentation for your game. We've provided Quake 3 and Xonotic entity conversion files (r2q3.rem and r2xonotic.rem). To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://git.teknik.io/scuti/reflex2q3/src/f2b0341da38b82ad4f0a0cf258b0f6e6d8335fda/docs/doc-entities.txt), our sample .rem files, and relevant documentation for your game.
####List all command line arguments: ####List all command line arguments:
```bash ```bash

6
include/EntityConverter.hpp
View File

@ -57,8 +57,8 @@ class EntityConverter
* Method: Constructor * Method: Constructor
* Description: Creates entity format mapping * Description: Creates entity format mapping
* CAUTION: Requires extractMapInfo method to be called after this * CAUTION: Requires extractMapInfo method to be called after this
* Requires: .ent filename for mapping entities from reflex format to xonotic format * Requires: Reflex Entity Mapping filename
* THROWS: runtime_error on .ent format error * THROWS: runtime_error on Reflex Entity Mapping file format error
* THROWS: std::ios::failure on IO failure * THROWS: std::ios::failure on IO failure
*-------------------------------------------------------------------------------------- *--------------------------------------------------------------------------------------
*/ */
@ -69,7 +69,7 @@ class EntityConverter
* Description: Creates entity format mapping and pre-scans for map info * Description: Creates entity format mapping and pre-scans for map info
* Parameter: string entityMapFile, file maps source to target entity formats * Parameter: string entityMapFile, file maps source to target entity formats
* Parameter: string reflexMapFile, for pre-scan * Parameter: string reflexMapFile, for pre-scan
* THROWS: runtime_error on .ent format error * THROWS: runtime_error on Reflex Entity Mapping file format error
* THROWS: std::ios::failure on IO failure * THROWS: std::ios::failure on IO failure
*-------------------------------------------------------------------------------------- *--------------------------------------------------------------------------------------
*/ */

0
r2q3.ent → r2q3.rem
View File

0
r2xonotic.ent → r2xonotic.rem
View File

4
src/EntityConverter.cpp
View File

@ -684,7 +684,7 @@ EntityConverter::mapEntities (const std::string &mapFile)
fin.open (mapFile); fin.open (mapFile);
if (fin.is_open()) { if (fin.is_open()) {
//Read .ent contents into pickup map //Read Reflex Entity Mapping file contents into pickup map
std::string line; std::string line;
while (std::getline (fin, line)) { while (std::getline (fin, line)) {
std::istringstream iss (line); std::istringstream iss (line);
@ -698,7 +698,7 @@ EntityConverter::mapEntities (const std::string &mapFile)
} }
} }
else { else {
throw std::ios::failure ("Error: EntityConverter failed to open .ent file"); throw std::ios::failure ("Error: EntityConverter failed to open Reflex Entity Mapping file");
} }
fin.close(); fin.close();

2
test/catch-entityconverter.cpp
View File

@ -21,7 +21,7 @@
#include "EntityConverter.hpp" #include "EntityConverter.hpp"
#define ENTITY_FILENAME "r2xonotic.ent" #define ENTITY_FILENAME "r2xonotic.rem"
#define DELTA 0.00001 #define DELTA 0.00001