diff --git a/.gitignore b/.gitignore index 0a63dc2..b0f2ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ pip-log.txt # Mac crap .DS_Store *.blend1 +/etc/.~lock.Hardness Calculator.xlsx# diff --git a/README.md b/README.md index e5856a0..cc69632 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,9 @@ Some major changes were done to make the mod easier to maintain: ## Changes: -'!' is for bugs in 2012 version that are fixed (as opposed to features that were changed/added) in this fork +'!' (near bottom) is for bugs in 2012 version that are fixed (as opposed to features that were changed/added) in this fork +* (2017-05-14) Added improved ruby item, mineral, & (realistic mode) block textures +* (2017-03-23) Added improved peridot (realistic mode) block texture * (2017-03-21) Added improved peridot item&mineral textures * (2017-03-20) Added improved opal item texture (finished all except optional realistic mode opal block) * (2017-03-20) Change garnet from Spessartine to pomegranate seed colored Rhodolite to reflect the original meaning of the word garnet (comes from the word pomegranate) -- see and https://www.americangemsociety.org/en/garnet-history @@ -129,7 +131,7 @@ Some major changes were done to make the mod easier to maintain: ## Minerals of note not in birthstones (for reference only) with density values from website above: -MORE but with hardness values available from 18carat.co.uk link above: +(NOTE: More, but with only Mohs hardness values, available from 18carat.co.uk link in spreadsheet) * Name,Density,Moh,Brinell * Apatite,3.16-3.23,5,137 * Calcite,2.69-2.71,3,53 @@ -145,28 +147,28 @@ Do the following steps to re-render a block: * Open the included Blend file in Blender and set the input nodes as follows (if there are two, set one as the input for absorption and turn that up--or experiment; ~ means wasn't plugged into any nodes): (v1L you can also tweak whether fresnel, facing, or IsTransmissionRay is Factor for "Glow Mix" node (you can also flip the inputs) (v2 you can also tweak whether Tangent, which Light Path output [and whether passes through Reduction node], or nothing [0.00] is used for Glare Mix's Factor; warped block shards can be fitted together then scaled by 1.01 on the x&z [s, shift z, 1.01]) -Name, GemColor, IOR**, Frost, Gloss, Clarity,Absorption, AbspSat, Glare Mix, GlareSat (Glare Saturation) -***Alexandrite,567274 to 63152c,1.75, ~, ~, .95, 1, 1.0, Gem:Tangent ; Block: Tangent*Reduction; Block east: 0.00, ~ -***Amethyst, ad87a6, 1.55, .5, 0, 0, 1, .5, ~, ~ -***Aquamarine, 8bdcdf, 1.564-1.596,~, ~, .95, 1, 0, Gem:PatchyNoise;, .5 -Aquamarine, (!8bdcdf)04A752, 1.564-1.596,.1, 0, .5, 0, 0, ~, ~ -Diamond, ced7da, 2.418, 0{.1}[.01], 0[.1], 1, 0, , , -Emerald, (!02552a)04A752, 1.5775-1.5835,0,.1, .99, .5, 0,,, -[Spessartine]Garnet,b5622c,1.73-1.75, 0, 0, .9, 0, , ,,, -[pom-colored]Garnet,910516,1.73-1.75, 0, 0.05, 1.0, 0, , ,,, -Opal, (texture), 1.52, , , , ,(see blend file version 2's "Stone" material) -Peridot, 85b116, 1.658-1.695, , , , , -Ruby, 832935, , , , , , -Sapphire, 163f7d, , , , , , -***Topaz, E5A55F, 1.62, .5, .5, 1.0, 0.0, 0.0 -Zircon, 255f75, , , , , , +Name, GemColor, IOR**, Frost, Gloss, Clarity,Absorption, AbspSat, Glare Mix, GlareSat (Glare Saturation) +***Alexandrite,567274 to 63152c,1.75, ~, ~, .95, 1, 1.0, Gem:Tangent ; Block: Tangent*Reduction; Block east: 0.00, ~ +***Amethyst, ad87a6, 1.55, .5, 0, 0, 1, .5, ~, ~ +***Aquamarine, 8bdcdf, 1.564-1.596, ~, ~, .95, 1, 0, Gem:PatchyNoise;, .5 +Aquamarine, (!8bdcdf)04A752,1.564-1.596, .1, 0, .5, 0, 0, ~, ~ +Diamond, ced7da, 2.418, 0{.1}[.01], 0[.1], 1, 0, , +Emerald, (!02552a)04A752,1.5775-1.5835, 0, .1, .99, .5, 0, , +[Spessartine]Garnet,b5622c,1.73-1.75, 0, 0, .9, 0, , , +[pom-colored]Garnet,910516,1.73-1.75, 0, 0.05, 1.0, 0, , , +Opal, (texture), 1.52, , , , ,(see blend file version 2's 'Stone' material), +Peridot, 85b116, 1.658-1.695, 0.001, 0.05, 0.99, 0, 0, , +Ruby, 832935, 1.766-1.774, , , , , , , +Sapphire, 163f7d, , , , , , , , +***Topaz, E5A55F, 1.62, .5, .5, 1.0, 0.0, 0.0, , +Zircon, 255f75, , , , , , ****LampSky changed from ~1 to 3, LampSunSquareYellow changed from .3 to 30, clouds from 1 to 4, starting from only item version of this to all future renders [] if in brackets, value is for block version ! means not that value: though that value is apparent from a reference photo, it is apparently not the true albedo {} if in bracurly braces, value is for mineral (ore) version ** Complete IOR Lists (values averaged or used from) http://forums.cgsociety.org/archive/index.php?t-513458.html - http://www.gemselect.com/gem-info/refractive-index.php + http://www.gemselect.com/gem-info/refractive-index.php (use this one--has double refraction info) *** old shader (usually Gem2, or sometimes Gem) was used as opposed to Gem3 (Frost was called Scatter, but it wasn't actually volumetric scatter in Gem shaders 1-2) - where '-' appears in IOR column, double refraction is used [different values in each IOR value input node]) Starting with emerald, block is rotated by 90 on z @@ -190,6 +192,8 @@ To make a Gem: * Object Data, check Autosmooth * Change angle (can be all the way up, such as 90, if you did mark sharp on all edges above) * Add Modifier, Displace, Add New, click "Show texture in texture tab" button to the right of it, change it from "Image or Movie" to Musgrave Multifractal, Intensity around .3, Size 2.0 or a little more than the size of the gem, then go back to Displace modifier and change Strength as needed (may have to be negative especially for some Musgrave patterns). +* To make 8-bit version, convert to 8-bit before scaling down from 128x128 to 16x16. +* To use existing Block Shards, keep in mind that for Block Shard Hex Pointed, Object data, mesh name can be changed between "BlockShardHexFlatSide" and "BlockShardHexPointed" ### Special Thanks diff --git a/etc/8bit/birthstones_mineral_ruby.png b/etc/8bit/birthstones_mineral_ruby.png new file mode 100644 index 0000000..b27eee9 Binary files /dev/null and b/etc/8bit/birthstones_mineral_ruby.png differ diff --git a/etc/BirefringenceToTwoValues.py b/etc/BirefringenceToTwoValues.py new file mode 100644 index 0000000..59252e4 --- /dev/null +++ b/etc/BirefringenceToTwoValues.py @@ -0,0 +1,26 @@ +import string + +try: + input = raw_input +except NameError: + pass + +print("This program will give you two refraction values with correct " + + "birefringence, the average of range you give being the center " + + "between the resulting values.") +refraction_range = input("refraction range [a - b format]: ") +birefringence_string = input("birefringence: ") +ref_extremes_strings = refraction_range.split("-") +if len(ref_extremes_strings) == 2: + ref_extremes = [ float(ref_extremes_strings[0].strip()), + float(ref_extremes_strings[1].strip()) ] + birefringence = float(birefringence_string) + average = ( ref_extremes[0] + ref_extremes[1] ) / 2.0 + results = [ average - birefringence/2.0, + average + birefringence/2.0 ] + print("Results: " + str(results[0]) + "-" + str(results[1])) +else: + print("refraction range must be in a - b format, such as 1.2-1.31") + exit(1) +# input("press enter to exit...") + diff --git a/etc/Hardness Calculator.xlsx b/etc/Hardness Calculator.xlsx index bc2a952..063f195 100644 Binary files a/etc/Hardness Calculator.xlsx and b/etc/Hardness Calculator.xlsx differ diff --git a/etc/alt/birthstones_ruby.png b/etc/alt/birthstones_ruby.png new file mode 100644 index 0000000..c46ab4d Binary files /dev/null and b/etc/alt/birthstones_ruby.png differ diff --git a/etc/birthstones_mineral_ruby ALPHA.png b/etc/birthstones_mineral_ruby ALPHA.png new file mode 100644 index 0000000..2a986f9 Binary files /dev/null and b/etc/birthstones_mineral_ruby ALPHA.png differ diff --git a/etc/birthstones_mineral_ruby COLOR.png b/etc/birthstones_mineral_ruby COLOR.png new file mode 100644 index 0000000..c22c446 Binary files /dev/null and b/etc/birthstones_mineral_ruby COLOR.png differ diff --git a/etc/expertmm_authored_texture_list.txt b/etc/expertmm_authored_texture_list.txt index 511198c..8e263c9 100644 --- a/etc/expertmm_authored_texture_list.txt +++ b/etc/expertmm_authored_texture_list.txt @@ -1,4 +1,7 @@ +expertmm authored the following textures and resources: (see README for sources) + +/textures birthstones_tool_alexandriteshovel.png birthstones_tool_alexandritesword.png birthstones_tool_amethystshovel.png @@ -23,3 +26,10 @@ birthstones_tool_topazshovel.png birthstones_tool_topazsword.png birthstones_tool_zirconshovel.png birthstones_tool_zirconsword.png +*_block_north.png +*_block_east.png +*_block_top.png +*_block.png + +/etc +(entire folder and all subfolders) diff --git a/etc/hd/birthstones_mineral_ruby.png b/etc/hd/birthstones_mineral_ruby.png new file mode 100644 index 0000000..cd986f1 Binary files /dev/null and b/etc/hd/birthstones_mineral_ruby.png differ diff --git a/etc/hd/birthstones_ruby_block_east.png b/etc/hd/birthstones_ruby_block_east.png new file mode 100644 index 0000000..8bb9f63 Binary files /dev/null and b/etc/hd/birthstones_ruby_block_east.png differ diff --git a/etc/hd/birthstones_ruby_block_north.png b/etc/hd/birthstones_ruby_block_north.png new file mode 100644 index 0000000..c5748e5 Binary files /dev/null and b/etc/hd/birthstones_ruby_block_north.png differ diff --git a/etc/hd/birthstones_ruby_block_top.png b/etc/hd/birthstones_ruby_block_top.png new file mode 100644 index 0000000..b2b8305 Binary files /dev/null and b/etc/hd/birthstones_ruby_block_top.png differ diff --git a/etc/minetest birthstones 2 expertmm.blend b/etc/minetest birthstones 2 expertmm.blend index 6f686b2..9fb0f51 100644 Binary files a/etc/minetest birthstones 2 expertmm.blend and b/etc/minetest birthstones 2 expertmm.blend differ diff --git a/textures/birthstones_mineral_ruby.png b/textures/birthstones_mineral_ruby.png index 05fc57c..5e659a7 100644 Binary files a/textures/birthstones_mineral_ruby.png and b/textures/birthstones_mineral_ruby.png differ diff --git a/textures/birthstones_ruby.png b/textures/birthstones_ruby.png index f0f8b95..cea67ba 100644 Binary files a/textures/birthstones_ruby.png and b/textures/birthstones_ruby.png differ diff --git a/textures/birthstones_ruby_block_east.png b/textures/birthstones_ruby_block_east.png new file mode 100644 index 0000000..a92a096 Binary files /dev/null and b/textures/birthstones_ruby_block_east.png differ diff --git a/textures/birthstones_ruby_block_north.png b/textures/birthstones_ruby_block_north.png new file mode 100644 index 0000000..389ffc7 Binary files /dev/null and b/textures/birthstones_ruby_block_north.png differ diff --git a/textures/birthstones_ruby_block_top.png b/textures/birthstones_ruby_block_top.png new file mode 100644 index 0000000..b2b12f9 Binary files /dev/null and b/textures/birthstones_ruby_block_top.png differ