Skip to content

Commit

Permalink
Make file formatting comply with POSIX and Unix standards
Browse files Browse the repository at this point in the history
UTF-8, LF, no BOM, and newlines at the end of files
  • Loading branch information
aaronfranke committed Mar 21, 2020
1 parent db74f35 commit 1529f95
Show file tree
Hide file tree
Showing 122 changed files with 187 additions and 189 deletions.
100 changes: 50 additions & 50 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
========================================================================
Open Asset Import Library (assimp) INSTALL
========================================================================
------------------------------
Getting the documentation
------------------------------
A regularly-updated copy is available at
http://assimp.sourceforge.net/lib_html/index.html
A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
To build the doxygen documentation on your own, follow these steps:
a) download & install latest doxygen
b) make sure doxygen is in the executable search path
c) navigate to ./doc
d) and run 'doxygen'
Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
and configure the path to it in the DOXYFILE first.
------------------------------
Building Assimp
------------------------------
More detailed build instructions can be found in the documentation,
this section is just for the inpatient among you.
CMake is the preferred build system for Assimp. The minimum required version
is 2.6. If you don't have it yet, downloads for CMake can be found on
http://www.cmake.org/.
For Unix:
1. mkdir build && cd build
2. cmake .. -G 'Unix Makefiles'
3. make -j4
For Windows:
1. Open a command prompt
2. mkdir build
3. cd build
4. cmake ..
5. cmake --build .
For iOS:
Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS

========================================================================
Open Asset Import Library (assimp) INSTALL
========================================================================

------------------------------
Getting the documentation
------------------------------

A regularly-updated copy is available at
http://assimp.sourceforge.net/lib_html/index.html

A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
To build the doxygen documentation on your own, follow these steps:

a) download & install latest doxygen
b) make sure doxygen is in the executable search path
c) navigate to ./doc
d) and run 'doxygen'

Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
and configure the path to it in the DOXYFILE first.

------------------------------
Building Assimp
------------------------------

More detailed build instructions can be found in the documentation,
this section is just for the inpatient among you.

CMake is the preferred build system for Assimp. The minimum required version
is 2.6. If you don't have it yet, downloads for CMake can be found on
http://www.cmake.org/.

For Unix:

1. mkdir build && cd build
2. cmake .. -G 'Unix Makefiles'
3. make -j4

For Windows:
1. Open a command prompt
2. mkdir build
3. cd build
4. cmake ..
5. cmake --build .

For iOS:
Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS
2 changes: 1 addition & 1 deletion code/AMF/AMFImporter_Geometry.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/AMF/AMFImporter_Macro.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/AMF/AMFImporter_Material.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/AMF/AMFImporter_Node.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/AMF/AMFImporter_Postprocess.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/Common/ImporterRegistry.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/MMD/MMDImporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ class MMDImporter : public BaseImporter {

} // Namespace Assimp

#endif
#endif
2 changes: 1 addition & 1 deletion code/PostProcessing/ArmaturePopulate.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ class ASSIMP_API ArmaturePopulate : public BaseProcess {
} // Namespace Assimp


#endif // SCALE_PROCESS_H_
#endif // SCALE_PROCESS_H_
2 changes: 1 addition & 1 deletion code/PostProcessing/ScaleProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ class ASSIMP_API ScaleProcess : public BaseProcess {
} // Namespace Assimp


#endif // SCALE_PROCESS_H_
#endif // SCALE_PROCESS_H_
2 changes: 1 addition & 1 deletion code/PostProcessing/ValidateDataStructure.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
---------------------------------------------------------------------------
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/glTF/glTFAsset.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/glTF/glTFExporter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/glTF/glTFImporter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/glTF2/glTF2Asset.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion code/glTF2/glTF2Exporter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/Open3DGC/o3dgcSC3DMCDecoder.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion contrib/android-cmake/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,4 @@ The _android-cmake_ should correctly handle projects with assembler sources (`*.

## Copying

_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
2 changes: 1 addition & 1 deletion contrib/gtest/docs/Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ documentation for that specific version instead.**
To contribute code to Google Test, read:

* [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
* [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
* [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_5_Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ This page lists all official documentation wiki pages for Google Test **1.5.0**
To contribute code to Google Test, read:

* DevGuide -- read this _before_ writing your first patch.
* [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.
* [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_5_PumpManual.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,4 @@ You can find real-world applications of Pump in [Google Test](http://www.google.
## Tips ##

* If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
* To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
* To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_5_XcodeGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ The Debugger has exited with status 0.

# Summary #

Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_6_Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ documentation for that specific version instead.**
To contribute code to Google Test, read:

* [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
* [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.
* [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_6_XcodeGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ The Debugger has exited with status 0.

# Summary #

Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_7_Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ documentation for that specific version instead.**
To contribute code to Google Test, read:

* [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
* [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.
* [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/V1_7_XcodeGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ The Debugger has exited with status 0.

# Summary #

Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
2 changes: 1 addition & 1 deletion contrib/gtest/docs/XcodeGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ The Debugger has exited with status 0.

# Summary #

Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
4 changes: 2 additions & 2 deletions contrib/poly2tri/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
==================
==================
INSTALLATION GUIDE
==================

Expand Down Expand Up @@ -48,4 +48,4 @@ Examples:
./p2t nazca_monkey.dat 0 0 9

./p2t random 10 100 5.0
./p2t random 1000 20000 0.025
./p2t random 1000 20000 0.025
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/common/shapes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -362,4 +362,4 @@ void Triangle::DebugPrint()
cout << points_[2]->x << "," << points_[2]->y << endl;
}

}
}
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/common/shapes.h
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,4 @@ inline void Triangle::IsInterior(bool b)

}

#endif
#endif
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/poly2tri.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
#include "common/shapes.h"
#include "sweep/cdt.h"

#endif
#endif
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/sweep/advancing_front.cc
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ AdvancingFront::~AdvancingFront()
{
}

}
}
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/sweep/advancing_front.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ inline void AdvancingFront::set_search(Node* node)

}

#endif
#endif
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/sweep/cdt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ CDT::~CDT()
delete sweep_;
}

}
}
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/sweep/cdt.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ class CDT

}

#endif
#endif
2 changes: 1 addition & 1 deletion contrib/poly2tri/poly2tri/sweep/sweep.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,4 +282,4 @@ class Sweep

}

#endif
#endif
2 changes: 1 addition & 1 deletion contrib/stb_image/stb_image.h
Original file line number Diff line number Diff line change
Expand Up @@ -7459,4 +7459,4 @@ AUTHORS 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.
------------------------------------------------------------------------------
*/
*/
2 changes: 1 addition & 1 deletion contrib/zip/.travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ else
make -j 8
make install
ASAN_OPTIONS=detect_leaks=0 LSAN_OPTIONS=verbosity=1:log_threads=1 ctest -V
fi
fi
2 changes: 1 addition & 1 deletion contrib/zip/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ after_success:
- make
- make test
# Uploading report to CodeCov
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion contrib/zlib/contrib/blast/test.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
AIAIAIAIAIAIA
AIAIAIAIAIAIA
2 changes: 1 addition & 1 deletion contrib/zlib/contrib/dotzlib/LICENSE_1_0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion contrib/zlib/contrib/testzlib/testzlib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ copy to a directory file from :
- contrib/masmx64
- contrib/vstudio/vc7

and open testzlib8.sln
and open testzlib8.sln
2 changes: 1 addition & 1 deletion contrib/zlib_note.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ This is a heavily modified and shrinked version of zlib 1.2.3

Assimp itself does not use the compression part yet, so
it needn't be compiled (trees.c, deflate.c, compress.c).
Currently these units are just used by assimp_cmd.
Currently these units are just used by assimp_cmd.
2 changes: 1 addition & 1 deletion doc/architecture/Assimp_Arch_Import.class.violet.html
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,4 @@
ETwCgEfwCAAewSMAeASP4BEAPIJHAPAIHgFItrEBsYNHAD7BK4gZPAKAR/AIAB7BIwCQBvwfU/j0
jy2hMWgAAAAASUVORK5C" />
</BODY>
</HTML>
</HTML>
2 changes: 1 addition & 1 deletion doc/architecture/Assimp_Arch_export.class.violet.html
Original file line number Diff line number Diff line change
Expand Up @@ -645,4 +645,4 @@
ahsAtY3aBtQ2AGobtQ1qGwC1jdoGtQ2A2kZtA2obALWN2ga1DUA1igr2o7ZBbQPw0/wD+/DsALUN
gNpGbYPaBkBto7ZBbQMAAD/R/wDNluGGIxSgmAAAAABJRU5ErkJg" />
</BODY>
</HTML>
</HTML>
Loading

0 comments on commit 1529f95

Please sign in to comment.