add different volume lights

Author: ekatrukha

src/main/java/bigtrace/BigTraceControlPanel.java

@@ -939,8 +939,10 @@ synchronized void voxelChanged(double [] newVoxelSize)
 	public void setRenderMethod(int nRenderType)
 	{
 		btdata.nRenderMethod = nRenderType;
+	
 		Prefs.set("BigTrace.nRenderMethod",btdata.nRenderMethod);
-		for(int i=0;i<bt.bvv_sources.size();i++)
+		
+		for(int i = 0; i < bt.bvv_sources.size(); i++)
 		{
 			bt.bvv_sources.get(i).setRenderType(nRenderType);
 		}	
@@ -953,10 +955,24 @@ public void setRenderMethod(int nRenderType)
 		if(nRenderType == BigTraceData.DATA_RENDER_MAX_INT)
 		{
 			bt.viewer.showMessage("maximum intensity");
-		}
+		}				
+	}
+
+	public void setVolumeLight(int nVolumeLight)
+	{
+		btdata.nVolumeLight = nVolumeLight;
+	
+		Prefs.set("BigTrace.nVolumeLight", btdata.nVolumeLight);
 
+		for(int i = 0; i < bt.bvv_sources.size(); i++)
+		{
+			bt.bvv_sources.get(i).setLightingType( nVolumeLight );
+		}	
+		if(bt.bvv_trace != null)
+			bt.bvv_trace.setLightingType( nVolumeLight );
 
 	}
+
 	@Override
 	public void actionPerformed(ActionEvent e) {
 

src/main/java/bigtrace/BigTraceData.java

@@ -132,10 +132,20 @@ public class BigTraceData < T extends RealType< T > & NativeType< T > >
 	public BCsettings bcTraceBox = new BCsettings();	
 
 	public static final int DATA_RENDER_MAX_INT = 0, DATA_RENDER_VOLUMETRIC = 1; 
+	
+	public static final int VOLUMELIGHT_PLAIN = 0, VOLUMELIGHT_SHADED = 1, VOLUMELIGHT_SHINY = 2; 
+	
 	/** dataset rendering method 
 	 * 0 maximum intensity, 
 	 * 1 volumetric **/
 	public int nRenderMethod = (int)Prefs.get("BigTrace.nRenderMethod", DATA_RENDER_MAX_INT);
+
+	/** dataset lighting option for volumetric rendering 
+	 * 0 plain, 
+	 * 1 shaded,
+	 * 2 shiny **/
+	public int nVolumeLight = (int)Prefs.get("BigTrace.nVolumeLight", VOLUMELIGHT_PLAIN);
+
 
 	/////////////////////////////////GLOBAL ROI APPEARANCE SETTINGS
 

src/main/java/bigtrace/gui/RenderMethodPanel.java

@@ -21,9 +21,11 @@ public class RenderMethodPanel < T extends RealType< T > & NativeType< T > > ext
 
 	private static final long serialVersionUID = 7367842640615289454L;
 
-	public JComboBox<String> cbRenderMethod;
+	public final JComboBox<String> cbRenderMethod;
 
-	public JComboBox<String> cbSurfaceRenderList; 
+	public final JComboBox<String> cbVolumeLight;
+	
+	public final JComboBox<String> cbSurfaceRenderList; 
 
 	String[] sSurfaceRenderType = {"plain", "shaded", "shiny", "silhouette"};
 
@@ -36,28 +38,44 @@ public RenderMethodPanel(BigTrace<T> bt_)
 
 		GridBagLayout gridbag = new GridBagLayout();
 		GridBagConstraints cd = new GridBagConstraints();
-		String[] sMethods = new String[2];
-		sMethods[0]="Max intensity";
-		sMethods[1]="Volumetric";
-	
-		cbRenderMethod = new JComboBox<>(sMethods);
+		String[] sRenderMethods = new String[2];
+		sRenderMethods[0] = "max intensity";
+		sRenderMethods[1] = "volumetric";
+
+		String[] sLightOptions = new String[3];
+		sLightOptions[0] = "plain";
+		sLightOptions[1] = "shaded";
+		sLightOptions[2] = "shiny";	
+		
+		cbRenderMethod = new JComboBox<>(sRenderMethods);
 		cbRenderMethod.setSelectedIndex(bt.btData.nRenderMethod);
 		cbRenderMethod.addActionListener(this);
 
+		cbVolumeLight = new JComboBox<>(sLightOptions);
+		cbVolumeLight.setSelectedIndex(bt.btData.nVolumeLight);
+		cbVolumeLight.addActionListener(this);
+
+		cbSurfaceRenderList = new JComboBox<>(sSurfaceRenderType);
+		cbSurfaceRenderList.setSelectedIndex(bt.btData.surfaceRender);
+		cbSurfaceRenderList.addActionListener(this);
+		
+		
 		setLayout(gridbag);
 
-		cd.gridx=0;
-		cd.gridy=0;
+		cd.gridx = 0;
+		cd.gridy = 0;
 		GBCHelper.alighLoose(cd);
-		this.add(new JLabel("Data:"),cd);
+		this.add(new JLabel("Data render:"),cd);
 		cd.gridx++;
 		this.add(cbRenderMethod,cd);
 
+		cd.gridx = 0;
+		cd.gridy++;
+		this.add(new JLabel("Volume light:"),cd);
+		cd.gridx++;
+		this.add(cbVolumeLight,cd);
 
-		cbSurfaceRenderList = new JComboBox<>(sSurfaceRenderType);
-		cbSurfaceRenderList.setSelectedIndex(bt.btData.surfaceRender);
-		cbSurfaceRenderList.addActionListener(this);
-		cd.gridx=0;
+		cd.gridx = 0;
 		cd.gridy++;
 		this.add(new JLabel("ROI surface:"),cd);
 		cd.gridx++;
@@ -69,6 +87,12 @@ public void actionPerformed(ActionEvent e) {
 		{
 			bt.btPanel.setRenderMethod(cbRenderMethod.getSelectedIndex());		
 		}
+		
+		if(e.getSource() == cbVolumeLight)
+		{
+			bt.btPanel.setVolumeLight(cbVolumeLight.getSelectedIndex());		
+		}
+		
 		if(e.getSource() == cbSurfaceRenderList)
 		{
 			if(bt.btData.surfaceRender != cbSurfaceRenderList.getSelectedIndex())

src/main/java/bigtrace/io/ViewsIO.java

@@ -50,6 +50,8 @@ public static < T extends RealType< T > & NativeType< T > > void saveView(final
 				writer.write("BigTrace_View,version," + BigTraceData.sVersion + "\n");
 				writer.write("FileNameFull," + bt.btData.sFileNameFullImg+"\n");
 				writer.write("Render Type," + Integer.toString( bt.btData.nRenderMethod )+"\n");
+				writer.write("Volume Light," + Integer.toString( bt.btData.nVolumeLight )+"\n");
+
 				writer.write("Canvas BG color," + Integer.toString( bt.btData.canvasBGColor.getRGB() )+"\n");
 				writer.write("nHalfClickSizeWindow," + Integer.toString( bt.btData.nHalfClickSizeWindow )+"\n");
 				writer.write("Zoom Box Size," + Integer.toString( bt.btData.nZoomBoxSize)+"\n");
@@ -213,7 +215,14 @@ public static < T extends RealType< T > & NativeType< T > > void loadView(final
 				switch (line_array[0])
 				{
 				case "Render Type":
-					bt.btPanel.setRenderMethod( Integer.parseInt( line_array[1]) );
+					int nRenderMethod = Integer.parseInt( line_array[1]);
+					bt.btPanel.setRenderMethod( nRenderMethod  );
+					bt.btPanel.renderMethodPanel.cbRenderMethod.setSelectedIndex( nRenderMethod  );
+					break;
+				case "Volume Light":
+					int nVolumeLight = Integer.parseInt( line_array[1]);
+					bt.btPanel.setVolumeLight( nVolumeLight ); 
+					bt.btPanel.renderMethodPanel.cbVolumeLight.setSelectedIndex( nVolumeLight  );
 					break;
 				case "Canvas BG color":					
 					final Color bgColor = new Color(Integer.parseInt(line_array[1]));
@@ -276,7 +285,9 @@ public static < T extends RealType< T > & NativeType< T > > void loadView(final
 					Prefs.set("BigTrace.crossSectionGridStep", bt.btData.crossSectionGridStep);
 					break;
 				case "surfaceRender":
-					bt.btData.surfaceRender = Integer.parseInt( line_array[1] );
+					int nSurfaceRender = Integer.parseInt( line_array[1]);
+					bt.btData.surfaceRender = nSurfaceRender;
+					bt.btPanel.renderMethodPanel.cbSurfaceRenderList.setSelectedIndex( nSurfaceRender );
 					Prefs.set("BigTrace.surfaceRender", bt.btData.surfaceRender);
 					break;
 				case "silhouetteRender":