Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,105 Commits 1 Branch 0 Tags
Commit Graph

1683 Commits

Author SHA1 Message Date
phkb
a128363a76 Another default shader small bug fix 2018-08-27 08:10:07 +10:00
AnotherCommander
4287a8e827 Corrected specular BRDF (we were passing the specular color of the lightsource to the FresnelSchlick calculation, instead of that of the material). Energy conservation is now fully in. As a result, yet another re-calibration of material light values in shipdata.plist. 2018-08-24 10:52:18 +02:00
AnotherCommander
5ec808a512
Hopefully fixed not being able to set gloss from specmap's alpha channel. 2018-08-23 15:45:25 +03:00
AnotherCommander
b759505b15 Adjusted the planet shader to use the same specular BRDF as the standard one. 2018-08-22 10:57:44 +02:00
AnotherCommander
8b8cb27195 Adjusted the specular BRDF to be more physically compliant and increased slightly the default gloss values in shipdata to compensate for the change. 2018-08-22 08:48:50 +02:00
phkb
10df924f5d Default shader small bug fix 2018-08-20 06:56:08 +10:00
AnotherCommander
5232e0a993 Added the material parameters gloss and ior (which stands for Index of Refraction). Using shininess instead of proper gloss was a hack and is not used anymore for specifying glossiness. Gloss takes values in the range 0.0 to 1.0 and ior takes positive values. Also implemented basic light energy conservation for diffuse, thanks to now having access to the refraction index of materials. Default settings in shipdata for gloss is 0.375 (except for missiles, thargoids and police) and for default ior value is 2.95 (iron), except for missiles, which is set to 2.16 (titanium). 2018-08-18 18:48:41 +02:00
AnotherCommander
48ca2ea920 Adjusted planets Blinn-Phong as well to match the GGX setting. 2018-08-15 09:45:23 +02:00
AnotherCommander
2a29e91c31 Fine tuned planet specularity a bit so it does not look too different compared to previously. 2018-08-15 09:18:29 +02:00
AnotherCommander
17e47ab429 Yet another shininess re-calibration. Shininess is meant to be from 0 to 128 and the way it was it made it so that the gloss parameter passed to GGX could not be more than 0.78 or so. This is now corrected, with 128 generating the max cap gloss value of 0.95. GGX and new Blinn-Phong do not look similar with the same shininess value as a result. 2018-08-13 16:38:57 +02:00
AnotherCommander
0b480a9464 Oopsie! 2018-08-13 12:24:48 +02:00
AnotherCommander
239414b3cd GGX specular model now applied also on the planet shader. 2018-08-13 11:57:18 +02:00
AnotherCommander
9111bedd89 Removed comment about default spec model, since it has been switched. 2018-08-11 13:11:29 +02:00
AnotherCommander
2383afcf2f Fixed GGX specular properly this time. GGX is now the default specular model. 2018-08-11 12:47:50 +02:00
AnotherCommander
9d592a47c5 Fixed (I think) bug with GGX specular rendering in dark areas and calibrated further the shininess of the default shipset. 2018-08-11 10:34:03 +02:00
AnotherCommander
4f3249555e Adjusted shininess values in shipdata so that defaults look similar to the old spec model and made new Blinn-Phong and GGX look more alike with those default values. 2018-08-11 08:37:24 +02:00
AnotherCommander
715e1b8e5d Changed parameter order in the new specular calculation methods for reasons of uniformity with the old method. Also, now using macros to select the desired specular model. Define OOSPECULAR_NEW_MODEL to 0 to use the old method, define OOSPECULAR_NEW_MODEL_GGX to use GGX or define nothing to use the new Blinn-Phong. 2018-08-10 22:26:12 +02:00
AnotherCommander
2237a8f272 Added two more physically accurate specular light models. The default shader can now support also GGX specular light, but we still default to Blinn-Phong. Spec intensity intentionally increased so that the effect can be seen immediately (can be lowered at a later stage). 2018-08-10 19:09:31 +02:00
AnotherCommander
63edd46980 Added minimalistic scanner, essentially a scanner without gridlines. Default setting can be defined in shipdata using the scanner_minimalistic key and it can be controlled by script too using the JS PlayerSHip scannerMinimalistic read/write property. 2018-07-20 21:20:09 +02:00
AnotherCommander
62894e37a5 Restore orange planet terminator tint, which was accidentally removed when atmosphere shaders were introduced. 2018-03-26 10:39:22 +02:00
AnotherCommander
91a36b8a76
Introducing the %G###### string expander. 
It works like the %J### one, but it takes two triplets of numbers rather than one, namely the system ID followed by the galaxy ID. This way we can refer to planet names in galaxies other than where the player is. %J### remains for compatibility reasons. Updated Constrictor Hunt mission strings to eliminate hard coded references to Xeer in the mission texts. (#290)
 2018-03-06 12:16:42 +02:00
phkb
c3406ef600 Fix for custom_chart_mission defaulting to correct background 2018-01-25 14:20:08 +11:00
AnotherCommander
ffe656979d Happy new year 2018-01-03 12:16:44 +01:00
phkb
e486175777 Multipage primable equip (#282) 
Adds multi-page ability to primable equipment manager
 2017-12-16 13:55:57 +02:00
AnotherCommander
8e417bc70a Easier to read version of the new planet diffuse lighting calculation. 2017-11-06 11:51:32 +01:00
jobi-wan
8d5277d31d Bumps master branch version number to 1.87 (#277) 2017-11-04 19:15:15 +01:00
AnotherCommander
7b58bc9382 Improved diffuse lighting on default planet shader. 2017-11-04 12:46:23 +01:00
phkb
de017b9414 Remove instances of 'vicious vicious' from planetinfo.plist 2017-10-29 09:55:58 +11:00
AnotherCommander
451665081a Version number bumped to 1.86. Code Freeze. 2017-10-17 15:36:47 +02:00
Nick Rogers
4e8a996acc Duplicate word in planet description 2017-08-10 11:50:37 +10:00
AnotherCommander
934bd29df1 Cleanup and optimizations on the default atmosphere shader. Thanks to CmdrSvengali for this contribution. Closes #254. 2017-08-07 00:16:07 +02:00
AnotherCommander
4e19314dc2 Use the length function in the atnosphere shader for calculating the length of the vector of the relative position of the player ship and the atmosphere entity. Closes #253. 2017-08-03 00:50:34 +02:00
AnotherCommander
bdb02bbe9d Target reticle colors for normal, target-sensitive and wormhole states can now be determined via hud.plist with the drawTargetReticle: dial related keys target_Rgba, target_sensitive_rgba and wormhole_rgba. Also, scripts can control these colors dynamically via the OOJSPlayerShip class properties reticleColorTarget, reticleColorTargetSensitive and reticleColorWormhole. 2017-07-16 20:28:54 +02:00
AnotherCommander
f972f6c0df Renamed the key text_standard_color to text_color for consistency. 2017-07-08 11:52:04 +02:00
AnotherCommander
73df6aa3ca Message colors are now under control of the HUD plists and scripts. The message_gui keys text_standard_color and text_comms_color control the colors of normal and incoming comms messages, while scripts can do the same by means of the JSPlayerShip keys messageGuiTextColor and messageGuiTextCommsColor respectively. This should address issue #235. 2017-07-07 19:47:24 +02:00
AnotherCommander
ef315aa88b Added the background_rgba key to the core HUD plists for reference. Default is fully transparent. 2017-07-07 11:42:14 +02:00
AnotherCommander
2e412b70a3 Added the default background_automatic key to the core hud plists. 2017-07-06 17:33:51 +02:00
AnotherCommander
4b322372a4 HUD Weapons Offline and FPS counter texts have now configurable colors by means of the rgb_color key in hud.plist. 2017-07-03 02:35:29 +02:00
phkb
6866e53437 F7 screen config and layout 2017-05-24 08:26:19 +10:00
AnotherCommander
9a7a947f6a Reverted ambient light recalibration and added the ambient_level = 0.25 line in planetinfo for each system instead. This way OXPs can change ambient level lighting on a per-system basis without requiring scripting. 2017-05-20 12:46:49 +02:00
AnotherCommander
15eb90fd79 Removed warning-generating test commodity data from Easy Start scenario. 2017-02-17 17:04:27 +01:00
AnotherCommander
16dcffc86f Experimental addition of Easy Start scenario (docked at Tionisla, 1000 Cr). 2017-02-16 20:51:48 +01:00
Kevin Anthoney
da4b3f7361 Remove jumps line from long range chart and contracts screen to avoid clashes 2017-01-25 13:16:48 +00:00
Kevin Anthoney
0dab7143a5 Merge branch 'master' of https://github.com/OoliteProject/oolite 2017-01-24 19:51:54 +00:00
Kevin Anthoney
f3c7b9e5be Add number of jumps to F6 chart screen 2017-01-24 19:50:58 +00:00
AnotherCommander
3ae3988347 Fixed incomplete implementation of class RouteElement warning and added distinction between singular and plural forms for hours and jumps on system data screen. 2017-01-23 19:40:40 +01:00
Kevin Anthoney
da688e4b5d Put systems data route info strings in descriptions.plist 2017-01-23 17:27:25 +00:00
AnotherCommander
32075335f5 Fixed broken Advanced Space Compass not being broken enough and introduced the JS PlayerShip class read/write property compassType (use with caution). 2017-01-13 15:11:23 +01:00
AnotherCommander
2ef7784b20 Happy new year! 2017-01-01 13:09:51 +01:00
AnotherCommander
b779a8f3ac Fixed fee alignment also for passenger contracts. 2016-12-10 23:02:40 +01:00