-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
165 additions
and
96 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Contributing | ||
|
|
||
| One of the easiest ways to contribute is to participate in discussions on GitHub issues. You can also contribute by | ||
| submitting pull requests with code changes. | ||
|
|
||
| Please note we have a code of conduct, please follow it in all your interactions with the project. | ||
|
|
||
| ## General feedback, discussions, bugs and feature requests | ||
|
|
||
| Start a discussion on the [issue tracker](https://github.com/FrozenStormInteractive/Crunch2/issues). | ||
|
|
||
| ## Pull Request Process | ||
|
|
||
| Please first discuss the change you wish to make via issue, email, or any other method with the owners of this | ||
| repository before making a change. | ||
|
|
||
| 1. Ensure any install or build dependencies are removed before the end of the layer when doing a | ||
| build. | ||
| 2. Update the README.md with details of changes to the interface, this includes new environment | ||
| variables, exposed ports, useful file locations and container parameters. | ||
| 3. You may merge the Pull Request in once you have the sign-off of other developers, or if you | ||
| do not have permission to do that, you may request the second reviewer to merge it for you. | ||
|
|
||
| ## Code of Conduct | ||
|
|
||
| This project has adopted the [Contributor Covenant Code of Conduct](https://github.com/FrozenStormInteractive/Code-of-Conduct/blob/master/CODE_OF_CONDUCT.md). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,9 @@ | ||
| // File: crn_core.cpp | ||
| // See Copyright Notice and license at the end of inc/crnlib.h | ||
| #include "crn_core.h" | ||
|
|
||
| #if CRNLIB_USE_WIN32_API | ||
| #include "crn_winhdr.h" | ||
| #endif | ||
| #include "crn_core.h" | ||
|
|
||
| namespace crnlib { | ||
| const char* g_copyright_str = "Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC"; | ||
| const char* g_sig_str = "C8cfRlaorj0wLtnMSxrBJxTC85rho2L9hUZKHcBL"; | ||
| namespace crnlib | ||
| { | ||
|
|
||
| } // namespace crnlib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,8 +88,6 @@ class crunch | |
| console::printf("-file @list.txt - List of files to convert."); | ||
| console::printf("Supported source file formats: dds,ktx,crn,tga,bmp,png,jpg/jpeg,psd"); | ||
| console::printf("Note: Some file format variants are unsupported."); | ||
| console::printf("See the docs for stb_image.c: http://www.nothings.org/stb_image.c"); | ||
| console::printf("Progressive JPEG files are supported, see: http://code.google.com/p/jpeg-compressor/"); | ||
|
|
||
| console::message("\nPath/file related parameters:"); | ||
| console::printf("-out filename - Output filename"); | ||
|
|
@@ -189,7 +187,7 @@ class crunch | |
| console::printf("-%s", pixel_format_helpers::get_pixel_format_string(fmt)); | ||
| } | ||
|
|
||
| console::printf("\nFor bugs, support, or feedback: [email protected]"); | ||
| console::printf("\nFor bugs, support, or feedback: https://github.com/FrozenStormInteractive/Crunch2"); | ||
| } | ||
|
|
||
| bool convert(const char* pCommand_line) | ||
|
|
@@ -1410,8 +1408,11 @@ static bool check_for_option(int argc, char* argv[], const char* pOption) | |
|
|
||
| static void print_title() | ||
| { | ||
| console::printf("crunch: Advanced DXTn Texture Compressor - https://github.com/BinomialLLC/crunch"); | ||
| console::printf("crunch - Advanced DXTn Texture Compressor - https://github.com/FrozenStormInteractive/Crunch2"); | ||
| console::printf(""); | ||
| console::printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC"); | ||
| console::printf("Copyright (c) 2020 FrozenStorm Interactive, Yoann Potinet"); | ||
| console::printf(""); | ||
| console::printf("crnlib version %s %s Built %s, %s", crn_get_version(), crnlib_is_x64() ? "x64" : "x86", __DATE__, __TIME__); | ||
| console::printf(""); | ||
| } | ||
|
|
@@ -1432,6 +1433,17 @@ static int main_internal(int argc, char* argv[]) | |
|
|
||
| print_title(); | ||
|
|
||
| if (check_for_option(argc, argv, "version")) | ||
| { | ||
| return EXIT_SUCCESS; | ||
| } | ||
|
|
||
| if (check_for_option(argc, argv, "help")) | ||
| { | ||
| crunch::print_usage(); | ||
| return EXIT_SUCCESS; | ||
| } | ||
|
|
||
| dynamic_string cmd_line; | ||
| get_command_line_as_single_string(cmd_line, argc, argv); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.