Skip to content

Commit

Permalink
updated license header and readme files
Browse files Browse the repository at this point in the history
framefactory committed Aug 13, 2019
1 parent 20b8431 commit 0ff77c6
Showing 18 changed files with 895 additions and 222 deletions.
97 changes: 44 additions & 53 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,61 @@
# MeshSmith Mesh Conversion Tool
## Apache License

## MIT License
Version 2.0, January 2004

Copyright (c) 2018 [Frame Factory GmbH, Ralph Wiedemeier](https://github.com/framelab)
http://www.apache.org/licenses/

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
### 1. Definitions.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.

# 3rd Pary Libraries
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

## CXXOpts
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.

Copyright (c) 2014 Jarryd Beck
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.

## JSON for modern C++
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."

Copyright (c) 2013-2017 Niels Lohmann
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
### 2. Grant of Copyright License.
Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
### 3. Grant of Patent License.
Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
### 4. Redistribution.
You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:

* You must give any other recipients of the Work or Derivative Works a copy of this License; and
* You must cause any modified files to carry prominent notices stating that You changed the files; and
* You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
* If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
* You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.

### 5. Submission of Contributions.
Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.

### 6. Trademarks
This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.

### 7. Disclaimer of Warranty.
Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.

### 8. Limitation of Liability.
In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.

### 9. Accepting Warranty or Additional Liability.
While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
230 changes: 144 additions & 86 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,117 +1,175 @@
# MeshSmith
Command line tool for mesh format conversion based on the Assimp mesh library and the Google Draco mesh compression library.

MeshSmith is open source software and part of the Smithsonian 3D Foundation Project. The tool is integrated in [Cook](https://github.com/Smithsonian/dpo-cook), Smithsonian's 3D Processing Pipeline.

## Features
* Converts from/to all available Assimp formats (OBJ, FBX, PLY, Collada, etc.)
* Exports compressed glTF and glb files (with format `gltfx` and `glbx`)
* Simple mesh operations such as coordinate swizzling, scaling, translation
* Inspection feature generates mesh statistics in JSON format

## Author
- [Ralph Wiedemeier, Frame Factory GmbH](https://github.com/framelab)

## Usage
### Command Line Options
```
Usage:
MeshSmith.exe [OPTION...]
-c, --config arg JSON configuration file
-i, --input arg Input file name
-o, --output arg Output file name
-f, --format arg Output file format
-a, --diffusemap arg Diffuse map file (gltfx/glbx only)
-b, --occlusionmap arg Occlusion map file (gltfx/glbx only)
-m, --normalmap arg Normal map file (gltfx/glbx only)
-e, --embedmaps Embed map images (gltfx/glbx only)
-t, --objectspacenormals Use object space normals (gltfx/glbx only)
-p, --compress Compress mesh data using Draco (gltfx/glbx only)
-j, --joinvertices Join identical vertices
-n, --stripnormals Strip normals
-u, --striptexcoords Strip texture coords
-z, --swizzle arg Swizzle coordinates
-s, --scale arg Scale scene by given factor
--flipuv Flip UV y coordinate
-r, --report Print JSON-formatted report
-l, --list Print JSON-formatted list of export formats
-v, --verbose Print log messages to std out
-h, --help Displays this message
```

#### Sample JSON Configuration file
Instead of specifying all parameters on the command line, a JSON configuration file can be used.
If both a command line option and a configuration file with the same option are present, the command
line option takes precendence. Note that a few less common options are only available via configuration
file.
MeshSmith.exe [OPTION...]
-c, --config arg JSON configuration file
-i, --input arg Input file name
-o, --output arg Output file name
-f, --format arg Output file format
-j, --joinvertices Join identical vertices
-n, --stripnormals Strip normals
-u, --striptexcoords Strip texture coords
-z, --swizzle arg Swizzle coordinates
-s, --scale arg Scale scene by given factor
--flipuv Flip UV y coordinate
-a, --diffusemap arg Diffuse map to be included (gltfx/glbx only)
-b, --occlusionmap arg Occlusion map to be included (gltfx/glbx only)
-m, --normalmap arg Normal map to be included (gltfx/glbx only)
-e, --embedmaps Embed maps (gltfx/glbx only)
-t, --objectspacenormals Use object space normals (gltfx/glbx only)
-p, --compress Compress mesh data using Draco (gltfx/glbx only)
-r, --report Print JSON-formatted report
-l, --list Print JSON-formatted list of export formats
-v, --verbose Print log messages to std out
-h, --help Displays this message
```

### Sample JSON Configuration file
Instead of specifying all parameters on the command line, a JSON configuration file can be specified via `--config` parameter.

If both a command line option and a configuration file with the same option are present, the command line option takes precendence. Note that a few advanced options are only available via configuration file.

```json
{
"input": "input-mesh.obj",
"output": "output.glb",
"format": "glbx",
"verbose": false,
"report": false,
"list": false,
"joinVertices": false,
"stripNormals": false,
"stripTexCoords": false,
"swizzle": "X+Y+Z+",
"scale": 1.0,
"translate": [ 0.0, 0.0, 0.0 ],
"gltfx": {
"useCompression": true,
"diffuseMap": "diffuse.jpg",
"occlusionMap": "occlusion.jpg",
"normalMap": "normals.jpg",
"objectSpaceNormals": true,
"embedMaps": false
},
"compression": {
"positionQuantizationBits": 14,
"texCoordsQuantizationBits": 12,
"normalsQuantizationBits": 10,
"genericQuantizationBits": 8,
"compressionLevel": 8
"input": "input-mesh.obj",
"output": "output.glb",
"format": "glbx",

"verbose": false,
"report": false,
"list": false,

"joinVertices": false,
"stripNormals": false,
"stripTexCoords": false,

"swizzle": "X+Y+Z+",
"scale": 1.0,
"translate": [ 0.0, 0.0, 0.0 ],
"alignX": 0, // 0 = center, -1 = minimum, 1 = maximum
"alignY": -1,
"alignZ": 1,
"flipUV": false,
"matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],

"gltfx": {
"metallicFactor": 0.1,
"roughnessFactor": 0.8,
"diffuseMap": "diffuse.jpg",
"occlusionMap": "occlusion.jpg",
"emissiveMap": "emissive.jpg",
"metallicRoughnessMap": "metallic-roughness.jpg",
"normalMap": "normals.jpg",
"zoneMap": "zones.jpg",

"objectSpaceNormals": true,
"embedMaps": false,
"useCompression": true
},
"compression": {
"positionQuantizationBits": 14,
"texCoordsQuantizationBits": 12,
"normalsQuantizationBits": 10,
"genericQuantizationBits": 8,
"compressionLevel": 8
}
}
}
```

## Build and Install
### Examples

##### Print all available input and output formats (JSON-formatted)
````
MeshSmith.exe --list
````
##### Call with configuration file
```
MeshSmith.exe --config my_config.json
```
##### Convert mesh from OBJ to PLY format
```
MeshSmith.exe -i input.obj -o output.ply -f plyb
```
##### Scale mesh by factor 0.1
```
MeshSmith.exe -i input.obj -o output.obj -f objnomtl -s 0.1
```
##### Create glTF file (uncompressed)
```
MeshSmith.exe -i mesh.obj -a diffuse.jpg -f gltfx
```
##### Create compressed GLB file with embedded maps
```
MeshSmith.exe -i mesh.obj -a diffuse.jpg -b occlusion.jpg -m normals.jpg --compress --embedmaps -f glbx
```

## Build and Install (Windows)

*Building MeshSmith on your own requires basic knowledge about building and maintaining C++ projects using CMake and Visual Studio. Currently the only supported operating system is Windows.*

### Prerequisites
- [Microsoft Visual Studio 2019](https://visualstudio.microsoft.com/vs/)
- [CMake 3.13.0 or higher](https://cmake.org/)

### 3rd Pary Libraries
#### Assimp

Assimp is a library to import and export various 3d-model-formats including scene-post-processing to generate missing render data.

MeshSmith uses a modified version of Assimp containing a number of fixes for handling large OBJ files.

* Prerequisites: CMake and Visual Studio 2019 installed
* Clone from https://github.com/framelab/assimp
* Build with cmake in separate `build` folder as follows
- Modified version: https://github.com/framelab/assimp
- Original repository: https://github.com/assimp/assimp

#### Draco

Draco is a library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.

- Repository: https://github.com/google/draco

#### Building the Libraries

Assimp and Draco are included in the MeshSmith repository as submodules. They can be found
in the `libs` subfolder. In order to properly clone the submodules, you need to clone
MeshSmith using the `--recurse-submodules` option.

```
mkdir build
cd build
cmake -G "Visual Studio 16 2019" ..
git clone --recurse-submodules https://github.com/Smithsonian/dpo-meshsmith
```
* Open Visual Studio 2019 project: build/Assimp.sln
* Build > Batch Build > Select `Assimp Debug` and `Release` builds
* Copy `build/code/Debug` and `build/code/Release` to `vendor/assimp/lib`
* Copy `include` and `build/include` to `vendor/assimp/include`

#### Google Draco
For convenience, a build script is provided in the MeshSmith root folder. It requires Visual Studio 2019 to be installed in its default location. Open a command
prompt and enter the following:

```
.\build-libs-win64.bat
```

* Prerequisites: CMake and Visual Studio 2019 installed
* Clone from https://github.com/google/draco
* Build with cmake in separate `build` folder as follows
#### Building the MeshSmith CLI Application

After building the libraries, the application build (debug and release versions) can be started like so:
```
mkdir build
cd build
cmake -G "Visual Studio 15 2017 Win64" ..
.\build-app-win64.bat
```
* Open Visual Studio 2017 project: `build/draco.sln`
* *Build > Batch Build*, select `Draco Debug/Release` and `INSTALL Debug/Release` builds
* Copy `build/Debug` and `build/Release` to `vendor/draco/lib`
* Copy `C:\Program Files\draco\include` and `build/include` to `vendor/draco/include`

### Build Meshsmith Application
##### Build output

* Open project in Visual Studio: *File > Open > CMake...*
* Select *CMake > Change CMake Settings...*
* Remove x86 Debug and x86 Release configurations
* Change type of x64 Release configuration to "Release"
* *CMake > Build*
* Copy Assimp DLLs to `bin/Debug` and `bin/Release` respectively
- Debug version: `bin\debug`
- Release version: `bin\release`
21 changes: 0 additions & 21 deletions README_ASSIMP_FIX.md

This file was deleted.

394 changes: 394 additions & 0 deletions THIRD_PARTY_LICENSES.md

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"input": "input-mesh.obj",
"output": "output.glb",
"format": "glbx",

"verbose": false,
"report": false,
"list": false,

"joinVertices": false,
"stripNormals": false,
"stripTexCoords": false,

"swizzle": "X+Y+Z+",
"scale": 1.0,
"translate": [ 0.0, 0.0, 0.0 ],
"alignX": 0,
"alignY": -1,
"alignZ": 1,
"flipUV": false,
"matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],

"gltfx": {
"metallicFactor": 0.1,
"roughnessFactor": 0.8,
"diffuseMap": "diffuse.jpg",
"occlusionMap": "occlusion.jpg",
"emissiveMap": "emissive.jpg",
"metallicRoughnessMap": "metallic-roughness.jpg",
"normalMap": "normals.jpg",
"zoneMap": "zones.jpg",

"objectSpaceNormals": true,
"embedMaps": false,
"useCompression": true
},
"compression": {
"positionQuantizationBits": 14,
"texCoordsQuantizationBits": 12,
"normalsQuantizationBits": 10,
"genericQuantizationBits": 8,
"compressionLevel": 8
}
}
87 changes: 87 additions & 0 deletions formats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
[
{
"description": "COLLADA - Digital Asset Exchange Schema",
"extension": "dae",
"id": "collada"
}, {
"description": "X Files",
"extension": "x",
"id": "x"
}, {
"description": "Step Files",
"extension": "stp",
"id": "stp"
}, {
"description": "Wavefront OBJ format (direct)",
"extension": "obj",
"id": "obj"
}, {
"description": "Wavefront OBJ format (direct) without material file",
"extension": "obj",
"id": "objnomtl"
}, {
"description": "Stereolithography",
"extension": "stl",
"id": "stl"
}, {
"description": "Stereolithography (binary)",
"extension": "stl",
"id": "stlb"
}, {
"description": "Stanford Polygon Library",
"extension": "ply",
"id": "ply"
}, {
"description": "Stanford Polygon Library (binary)",
"extension": "ply",
"id": "plyb"
}, {
"description": "Autodesk 3DS (legacy)",
"extension": "3ds",
"id": "3ds"
}, {
"description": "GL Transmission Format v. 2",
"extension": "gltf",
"id": "gltf2"
}, {
"description": "GL Transmission Format v. 2 (binary)",
"extension": "glb",
"id": "glb2"
}, {
"description": "GL Transmission Format",
"extension": "gltf",
"id": "gltf"
}, {
"description": "GL Transmission Format (binary)",
"extension": "glb",
"id": "glb"
}, {
"description": "Assimp Binary File",
"extension": "assbin",
"id": "assbin"
}, {
"description": "Assimp XML Document",
"extension": "assxml",
"id": "assxml"
}, {
"description": "Extensible 3D",
"extension": "x3d",
"id": "x3d"
}, {
"description": "Autodesk FBX (binary)",
"extension": "fbx",
"id": "fbx"
}, {
"description": "Autodesk FBX (ascii)",
"extension": "fbx",
"id": "fbxa"
}, {
"description": "The 3MF-File-Format",
"extension": "3mf",
"id": "3mf"
}, {
"description": "Assimp JSON Document",
"extension": "json",
"id": "assjson"
}
]
18 changes: 14 additions & 4 deletions source/cli/main.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
/**
* Intermesh CLI
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "cxxopts.h"
@@ -37,7 +47,7 @@ int main(int argc, char** ppArgv)

cxxopts::Options cliOptions(
"MeshSmith.exe",
"MeshSmith Mesh Conversion Tool, CLI v0.6.5, 2019-08-12"
"MeshSmith Mesh Conversion Tool, CLI v0.7.0, 2019-08-13"
);

cliOptions.add_options()
22 changes: 16 additions & 6 deletions source/core/Debug.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* Intermesh Engine
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#if defined(WIN32) && defined(_DEBUG)
#include <Windows.h>
@@ -59,4 +69,4 @@ namespace meshsmith
{
};
}
#endif
#endif
20 changes: 15 additions & 5 deletions source/core/Engine.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* Intermesh Engine
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "Engine.h"

18 changes: 14 additions & 4 deletions source/core/Engine.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
/**
* Intermesh Engine
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef _MESHSMITH_ENGINE_H
@@ -37,4 +47,4 @@ namespace meshsmith
};
}

#endif // _MESHSMITH_ENGINE_H
#endif // _MESHSMITH_ENGINE_H
20 changes: 15 additions & 5 deletions source/core/GLTFExporter.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* MeshSmith
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "GLTFExporter.h"

22 changes: 16 additions & 6 deletions source/core/GLTFExporter.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* MeshSmith
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef _MESHSMITH_GLTFEXPORTER_H
#define _MESHSMITH_GLTFEXPORTER_H
@@ -127,4 +137,4 @@ namespace meshsmith
};
}

#endif // _MESHSMITH_GLTFEXPORTER_H
#endif // _MESHSMITH_GLTFEXPORTER_H
22 changes: 16 additions & 6 deletions source/core/Options.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* MeshSmith
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "Options.h"
#include <iostream>
@@ -213,4 +223,4 @@ json Options::toJSON() const
}

return result;
}
}
22 changes: 16 additions & 6 deletions source/core/Options.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* MeshSmith
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef _MESHSMITH_OPTIONS_H
#define _MESHSMITH_OPTIONS_H
@@ -66,4 +76,4 @@ namespace meshsmith
};
}

#endif // _MESHSMITH_OPTIONS_H
#endif // _MESHSMITH_OPTIONS_H
20 changes: 15 additions & 5 deletions source/core/Processor.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* Intermesh Processor
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "Processor.h"

22 changes: 16 additions & 6 deletions source/core/Processor.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* Intermesh Processor
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef _MESHSMITH_PROCESSOR_H
#define _MESHSMITH_PROCESSOR_H
@@ -57,4 +67,4 @@ namespace meshsmith
};
}

#endif // _MESHSMITH_PROCESSOR_H
#endif // _MESHSMITH_PROCESSOR_H
20 changes: 15 additions & 5 deletions source/core/Scene.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
/**
* Intermesh Engine
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
*/
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "Scene.h"
#include "Processor.h"
18 changes: 14 additions & 4 deletions source/core/Scene.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
/**
* Intermesh Engine
* 3D Foundation Project
* Copyright 2019 Smithsonian Institution
*
* @author Ralph Wiedemeier <ralph@framefactory.ch>
* @copyright (c) 2018 Frame Factory GmbH.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef _MESHSMITH_SCENE_H
@@ -64,4 +74,4 @@ namespace meshsmith
};
}

#endif // _MESHSMITH_SCENE_H
#endif // _MESHSMITH_SCENE_H

0 comments on commit 0ff77c6

Please sign in to comment.