Export sun intensity.

Author: SamuelTallet

source/pbr.rb

@@ -26,7 +26,7 @@
 # PBR plugin namespace.
 module PBR
 
-  VERSION = '1.5.7'.freeze
+  VERSION = '1.5.8'.freeze
 
   # Load translation if it's available for current locale.
   TRANSLATE = LanguageHandler.new('pbr.strings')

source/pbr/Viewport App/viewport.html

@@ -13,7 +13,7 @@
 		<script src="lib/claygl.modded.js"></script>
 		<script src="lib/claygl-advanced-renderer.min.js"></script>
 
-		<script src="assets/sketchup-sun-dir.json"></script>
+		<script src="assets/sketchup-sunlight.json"></script>
 		<script src="assets/sketchup-locale.json"></script>
 
 		<link rel="stylesheet" href="viewport.css"></link>

source/pbr/Viewport App/viewport.js

@@ -157,7 +157,8 @@ localforage.getItem('cameraPosition').then(function(cameraPosition) {
 
 			// Instantiate an adv. renderer.
 			this._advancedRenderer = new ClayAdvancedRenderer(
-				app.renderer, app.scene, app.timeline, PBR.Viewport.cfg.advancedGraphics
+				app.renderer, app.scene, app.timeline,
+				PBR.Viewport.cfg.advancedGraphics
 			);
 
 			// Create a perspective camera.
@@ -191,8 +192,13 @@ localforage.getItem('cameraPosition').then(function(cameraPosition) {
 
 			// Create an cubemap ambient light and an spherical harmonic ambient
 			// light for specular and diffuse lighting in PBR rendering.
-			return app.createAmbientCubemapLight('assets/equirectangular.hdr', 0.8, 0.8)
-				.then(function (ambientLight){
+			return app.createAmbientCubemapLight(
+
+					'assets/equirectangular.hdr',
+					sketchUpSunlight.intensity,
+					sketchUpSunlight.intensity
+
+				).then(function(ambientLight) {
 
 					PBR.Viewport.naturalLights.diffuse = ambientLight.diffuse;
 					PBR.Viewport.naturalLights.specular = ambientLight.specular;
@@ -201,25 +207,31 @@ localforage.getItem('cameraPosition').then(function(cameraPosition) {
 					PBR.Viewport.naturalLights.direct = app.createDirectionalLight(
 						[
 							// XXX XYZ to -X-ZY
-							sketchUpSunDir.x * -1,
-							sketchUpSunDir.z * -1,
-							sketchUpSunDir.y,
+							sketchUpSunlight.direction.x * -1,
+							sketchUpSunlight.direction.z * -1,
+							sketchUpSunlight.direction.y,
 						],
-						 '#fff',
-						 0.8
+						'#fff',
+						sketchUpSunlight.intensity
 					);
 
+					document.querySelector('#sunlightIntensity .slider').value = sketchUpSunlight.intensity;
+
 					PBR.Viewport.naturalLights.direct.shadowResolution = 4096;
 
 					// Set HDR background image.
 					new clay.plugin.Skybox({
+
 						scene: app.scene,
 						environmentMap: ambientLight.environmentMap
+
 					});
 
 					// Load a glTF format model.
 					app.loadModel('assets/sketchup-model.gltf', {
+
 						textureConvertToPOT: true
+
 					}).then(function (model) {
 
 						if ( model.json.extras && model.json.extras.lights ) {
@@ -262,14 +274,18 @@ localforage.getItem('cameraPosition').then(function(cameraPosition) {
 							if ( glTFMaterial.extras && glTFMaterial.extras.parallaxOcclusionTextureURI ) {
 
 								app.loadTexture(glTFMaterial.extras.parallaxOcclusionTextureURI, {
+
 									convertToPOT: true,
 									anisotropic: 16,
 									flipY: false
-								}).then(function (parallaxOcclusionTexture) {
+
+								}).then(function(parallaxOcclusionTexture) {
+
 									clayMaterial.set('parallaxOcclusionMap', parallaxOcclusionTexture);
 									clayMaterial.set('parallaxOcclusionScale', 0.05);
 									clayMaterial.set('parallaxMinLayers', 50);
 									clayMaterial.set('parallaxMaxLayers', 50);
+									
 								});
 
 							}

source/pbr/sun_observer.rb

@@ -34,12 +34,12 @@ class SunObserver < Sketchup::ShadowInfoObserver
     # When user changes shadow settings:
     def onShadowInfoChanged(_shadow_info, type)
 
-      # Escape if it's not about "Time/Date sliders".
-      return unless type.zero?
+      # Escape if it's not about "Time/Date/Light/Dark sliders".
+      return unless type == 0 || type == 2
 
       if SESSION[:track_all_changes?]
 
-        Viewport.update_sun_direction
+        Viewport.update_sunlight
 
         Viewport.update_data_version
 

source/pbr/viewport.rb

@@ -96,24 +96,32 @@ def self.update_translation
 
     end
 
-    # Updates Viewport sun direction.
+    # Updates Viewport sunlight.
     #
     # @return [nil]
-    def self.update_sun_direction
+    def self.update_sunlight
 
-      sun_vec = Sketchup.active_model.shadow_info['SunDirection']
+      sun_direction = Sketchup.active_model.shadow_info['SunDirection']
 
-      sun_dir = {
+      sun_intensity = Sketchup.active_model.shadow_info['Light'].to_f / 100
 
-        x: sun_vec.x,
-        y: sun_vec.y,
-        z: sun_vec.z
+      sunlight = {
+
+        direction: {
+
+          x: sun_direction.x,
+          y: sun_direction.y,
+          z: sun_direction.z
+
+        },
+
+        intensity: sun_intensity
 
       }
 
-      sun_dir_path = File.join(ASSETS_DIR, 'sketchup-sun-dir.json')
+      sunlight_path = File.join(ASSETS_DIR, 'sketchup-sunlight.json')
 
-      File.write(sun_dir_path, 'sketchUpSunDir = ' + sun_dir.to_json + ';')
+      File.write(sunlight_path, 'sketchUpSunlight = ' + sunlight.to_json + ';')
 
       nil
 
@@ -132,7 +140,7 @@ def self.update
 
       File.write(gltf_path, gltf.json) if gltf.valid?
 
-      update_sun_direction
+      update_sunlight
 
       update_translation