Wykres commitów

64 Commity (74eef79a3fcdfb33422918d064f2214e29d72a77)

Autor SHA1 Wiadomość Data
Torrin Leonard 74eef79a3f Revert "Merge branch 'Logic_v2_and_minor_changes' into main"
This reverts commit e31d2abf36, reversing
changes made to 138e1b967b.
2022-08-10 22:18:35 -04:00
Torrin Leonard e31d2abf36
Merge branch 'Logic_v2_and_minor_changes' into main 2022-08-10 22:16:45 -04:00
matt-159 ce8a04f5f9 Pulled out code into Intermediate module 2022-07-14 07:02:25 -07:00
matt-159 ffc216798e pulled out duplicated code into getBMNFTData() function 2022-07-14 07:02:05 -07:00
matt-159 5abbb525a4 improved readability 2022-06-30 22:14:22 -07:00
matt-159 50c5d09da7 Added intermediary function wrapper 2022-06-30 21:36:07 -07:00
matt-159 09bcceb209 added logic file argument 2022-06-30 21:03:39 -07:00
Torrin Leonard f0ba77f7a4 Added "NOT" rule to Logic
- Email is now only activated if the user specifies
- Implemented "NOT" rule in Logic.py
- Added documentation for Synced Attribute Material values in Material_Generator.py
2022-06-20 09:32:49 -04:00
Torrin Leonard e449ee3bdf Small change 2022-06-18 21:03:17 -04:00
Torrin Leonard 082edaf4e7 Adding the ability to send emails when Batch is complete
- Reverted Materials over Logic change in DNA_Generator.py
2022-06-18 20:29:02 -04:00
Torrin Leonard f32f2baf3c Adding Auto shutdown functionality 2022-06-18 14:21:25 -04:00
Torrin Leonard 472d942b9f Fixing small issue with Logic 2022-06-11 08:48:09 -04:00
Torrin Leonard 50b869fe09 Removing problematic test code 2022-06-08 23:05:51 -04:00
Torrin Leonard b4ecfe7451 Changing Material Rarity and adding error message 2022-06-07 09:12:27 -04:00
Torrin Leonard 3cb2a69c81 Changes to Materials and Logic
- Added AutoSave before generation functionality to Other panel
- Removed strip_empty_exclude function
- Modified Exporter to work with new Material Randomizer layout
- Added Enable Materials option in logicafyDNAsingle function in preparation for Material Randomizer Logic
- Materials are no longer formatted like Variants, the Material List is now a dictionary where the keys are the names of the Materials and the values are the Rarity percentages. Each Variant in the Materials.json file can have a different list with different rarity values that are selected for only that variant.

Material file format:
```
{
    "Variant Name": {
        "Material List": {
            "Material Name 1": 90,
            "Material Name 2": 5,
            "Material Name 3": 1,
            "Material Name 4": 4
        },
        "Variant Objects": []
    }
}
```
2022-06-06 17:04:25 -04:00
Torrin Leonard 17cbf3a32f Revamping Logic
Lots more info in the comments of the code.

Documentation still needs to be made, also more testing lol

This is the new format for Logic.json files:

```
{
    "Rule-1":{
        "IF": [
            "Variant collection name"
        ],
        "THEN":[
            "Attribute collection name", "Variant collection name"
        ]
    }
}
```

Some basic guidelines, needs to be more thorough and cleaned up for documentation:

Attributes and Variants can be used in the “THEN” list, Variants can only be used in the “IF” list.

If a full attribute is detected in the “THEN” list (either by the attribute collection name or all variant collection names in that attribute) and a variant is not detected in the “IF” list, the attribute detected in the “THEN” list will be set to “EMPTY”.

Variants in the “IF” list may be from the same or separate attributes, however they must never be from the same attribute as variants in the “THEN” list.

I need sleep.

Note to self: The Logic UI List needs to be updated to reflect these changes to Logics core functionality, the current UI List is broken on this branch and wont work.

Also added save_result to Constants.py for basic logging functionality.
2022-06-05 23:46:49 -04:00
Torrin Leonard 6495b12654 Initial commit 2022-06-03 22:47:09 -04:00
Torrin Leonard 7bb741a185
Merge pull request #104 from glassbrickstudio/main
Sorry this took so long lol, been very busy with V4 and our new web service Cozy API. Thanks for the pull request!
2022-05-31 08:25:02 -04:00
Torrin Leonard 51637e9bab
Merge branch 'main' into BMNFTs_V4_Alpha 2022-05-31 08:18:03 -04:00
Torrin Leonard 8f3a95caf1 Fixing weird issue with MP4 slipping through if statements 2022-05-31 08:03:52 -04:00
Torrin Leonard 3a874aea71 Reformatting refactorer to support Tiff and PNG folder animations 2022-05-31 01:28:01 -04:00
Torrin Leonard 643c2f1819 Error messages and minor changes
- Changed labeling in __init__.py to reflect new workflow
- Updated Checks.py to stop throwing weird error and to now catch Script_Ignore collection error
- Added error message if you change collection name after data is created and you generate your nfts
- Added more info in comments and relocated Change Text Object in Scene
- Metadata no longer contains order number and rarity number
2022-05-30 22:45:39 -04:00
Torrin Leonard 62dd24796c Formatting
Formatting Exceptions with colours and adding an aditional exception for the name.
2022-05-25 11:34:24 -04:00
Abrar Faiaz Adnan 33cacab994 shows which attribute has naming problem
added few lines to show which attribute has naming problem, along with the github link to the readme file showing how to fix it
2022-05-24 22:48:38 +06:00
Torrin Leonard 977ad3999f
Update Logic.py 2022-05-12 11:05:49 -04:00
Torrin Leonard 722588e39b Refactoring files and Metadata methods
- Deprecated Batch_Sorter.py
- Refactored DNA_Generator.send_To_JSON calls in __init__.py
- Reformatted Checks.py
- All DNA now has an order number and is kept in order throughout the DNA Generation process.
- Added makeBatches() (from Batch_Sorter.py) to DNA_Generator.py. Batch sorting now happens inside DNA_Generator.py.
- Added confirmation box to Create NFT Data operator
- Exporter now keeps track of DNA order_num for each NFT
- Changed animation to work on Windows and Mac
- Reformatted Metadata.py to work with Exporter instead of Refactorer. Metadata is now generated while NFTs media files are rendered/generated.
- Heavily refactored the Refactoerer.py file.
2022-05-10 08:14:53 -04:00
glass brick studio 92f4a1f289
fixed placeholder name for Cardano metadata
"image": "<ipfs_link>",
 "mediaType": "<mime_type>"
2022-05-09 19:19:25 +05:30
Torrin Leonard 7acf36759b Adding text Object Test (Commented out) 2022-04-26 13:56:40 -04:00
Torrin Leonard b51eabda5e Adding Materials to Metadata and other fixes 2022-04-23 19:11:24 -04:00
Torrin Leonard b02290b25a Fixing issue with Material Randomizer integration 2022-04-21 17:36:27 -04:00
Torrin Leonard b13da292bb Adding Material Randomizer 2022-04-20 18:10:22 -04:00
Torrin Leonard 4384111e85
Merge branch 'UIList_Implementation' into Material_Randomizer_Metapanda 2022-04-20 14:50:53 -04:00
Torrin Leonard 2b0856b90b
Merge pull request #92 from TheBrochacho/main
Added another optional argument
2022-04-19 22:15:39 -04:00
Torrin Leonard 00a87d993b Fix and Time tracking
- BMNFTs now stores total time and batch time across batches for better use with clients/contractor work
- Exporter revamp for time tracking
- Refactorer revamp for time tracking
2022-04-19 21:54:17 -04:00
Torrin Leonard d53db65900 Adding UIList for Logic and reorganizing UIList elements 2022-04-19 21:04:17 -04:00
Torrin Leonard ee7a4dab41 Adding UIList functionality to Custom Metadata Fields
Implemented UIlist method. You are now able to create custom metadata fields all in Blender and each field is dynamically added to the Metadata template that the user selects.
2022-04-18 11:06:04 -04:00
Torrin Leonard 3de95e30d8 Adding file sorting method to Constants.py 2022-04-17 18:20:35 -04:00
Torrin Leonard d093bf9745 Adding Constants File to clean up code 2022-04-17 17:01:10 -04:00
Torrin Leonard a7262334f2 Further integration and creation of the Material_Generator.py 2022-04-17 16:42:47 -04:00
Matt bae5f2e1a4 added '--batch-data-path' argument 2022-04-15 08:36:55 -07:00
Matthew 858df75bfe
Merge pull request #1 from TheBrochacho/CLI-Compat
Cli compat
2022-04-12 14:16:06 -07:00
Matt 91d06812cf found a use case for the config file 2022-04-12 10:09:34 -07:00
Matt d086c6c302 exporting a config was unnecessary 2022-04-12 09:32:09 -07:00
Matt 4eb4f8b213 added batch specification option 2022-04-12 01:07:13 -07:00
Matt 99946a11e6 removed -o and -s due to ambiguity 2022-04-12 01:00:47 -07:00
Matt 31716ba1fd removed -c due to ambiguity 2022-04-12 00:50:43 -07:00
Matt c2be2c9ed0 added save path overriding 2022-04-11 22:44:56 -07:00
Matt fb8632e72a added CLI utility 2022-04-11 22:39:58 -07:00
Torrin Leonard 1527129ddd Fixing issue with Attributes and Variants in Logic 2022-04-11 22:49:40 -04:00
Torrin Leonard c8e8d62837 Committing Logic patch and Checks 2022-04-09 13:34:43 -04:00