Tweaking the CSS

documents/SConscript

+import os
+
+env = Environment()
+
+ret = os.system('doxygen doxygen.conf')

documents/SConstruct

+env = Environment()
+
+env.SConscript('SConscript')

documents/alta_logo.svg

@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="260"
    height="100"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="alta_logo.svg"
    inkscape:export-filename="/home/laurent/PostDoc/Projects/alta/documents/alta_icon.png"
    inkscape:export-xdpi="19.200001"
@@ -28,8 +28,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.979899"
-     inkscape:cx="174.41936"
-     inkscape:cy="143.14496"
+     inkscape:cx="164.82291"
+     inkscape:cy="137.62971"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -37,10 +37,10 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1215"
-     inkscape:window-height="776"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
+     inkscape:window-width="1200"
+     inkscape:window-height="1888"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -50,7 +50,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -58,10 +58,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-218.72743,-400.84796)">
+     transform="translate(-218.72743,-395.33271)">
     <g
        id="g3008"
-       transform="matrix(0.340257,0,0,0.340257,144.30389,328.99877)">
+       transform="matrix(0.340257,0,0,0.340257,145.31405,324.51401)">
       <path
          sodipodi:nodetypes="sssssscss"
          inkscape:connector-curvature="0"
@@ -215,5 +215,17 @@
          d="m 351.76926,411.13346 c 10.71797,-11.13495 13.99811,-25.36757 13.57674,-25.77316 -0.45147,-0.43456 -14.51851,3.41511 -25.23648,14.55007 -10.71796,11.13495 -16.79646,22.67398 -13.57671,25.77316 3.21974,3.09916 14.51848,-3.41511 25.23645,-14.55007 z"
          style="fill:none;stroke:#cdd1ff;stroke-width:0.79749054;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
     </g>
+    <text
+       xml:space="preserve"
+       style="font-size:72.44132996px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Comfortaa;-inkscape-font-specification:Comfortaa"
+       x="287.89276"
+       y="472.83273"
+       id="text3009"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3011"
+         x="287.89276"
+         y="472.83273"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">ALTA</tspan></text>
   </g>
 </svg>

documents/doxygen.conf

 PROJECT_NAME     = ALTA
 PROJECT_NUMBER   = 0.1
+SEARCHENGINE     = NO
+
 INPUT            = ../sources ../sources/scripts .
 OUTPUT_DIRECTORY = ./doxygen
 RECURSIVE        = YES
@@ -12,4 +14,5 @@ DISABLE_INDEX    = YES
 PROJECT_LOGO     = alta_logo.svg
 
 MULTILINE_CPP_IS_BRIEF = YES
+
 HTML_STYLESHEET  = doxygen.css

documents/mainpage.dox

@@ -5,7 +5,10 @@
 ALTA is a software library to analyse, fit and understand BRDFs. It
 provides a set of command line softwares to fit measured data to analytical
 forms, tools to understand models and data.
-<br /><br />
+
+<h3>Target audience</h3>
+You are a <bold>researcher</bold> working on BRDFs and you want to 
+experiment a new model and compare it with other models and data easily.
 
 
 <h2>Download and install</h2>
@@ -33,7 +36,6 @@ plugins).
 
 To use QMake, or for a more detailed view of ALTA's building scripts and
 dependencies, please refer to \ref install.
-<br /><br />
 
 
 <h2>How to use it</h2>
@@ -59,7 +61,6 @@ To convert this brdf file (in ALTA \ref format), you will need another command:
 Matlab m file, C++ code, or BRDF Explorer shader. Note that this tool cannot
 convert to another ALTA file (e.g. converting a Blinn lobe to a Beckmann
 distribution).
-<br /><br />
 
 
 <h2>Contribute</h2>

sources/core/params.cpp

@@ -92,11 +92,11 @@ void params::to_cartesian(const double* invec, params::input intype,
 			break;
 		case ISOTROPIC_TV_PROJ_DPHI:
 		{
-			const double theta = 0.5*sqrt(invec[0]*invec[0] + invec[1]*invec[1]);
+			const double theta = sqrt(invec[0]*invec[0] + invec[1]*invec[1]);
 			if(theta > 0.0)
 			{
-				outvec[3] = invec[0]/theta*sin(theta);
-				outvec[4] = invec[1]/theta*sin(theta);
+				outvec[3] = (invec[0]/theta)*sin(theta);
+				outvec[4] = (invec[1]/theta)*sin(theta);
 			}
 			else
 			{

sources/plugins/nonlinear_function_beckmann/function.cpp

@@ -59,7 +59,7 @@ vec beckmann_function::value(const vec& x) const
 
 		if(h[2] > 0.0 && x[2]*x[5]>0.0)
 		{
-			res[i] = _ks[i] / (4.0 * x[2]*x[5] * M_PI * a2 * dh2*dh2) * expo;
+			res[i] = _ks[i] / (4.0 /* x[2]*x[5] */* M_PI * a2 * dh2*dh2) * expo;
 		}
 		else
 		{
@@ -142,13 +142,13 @@ vec beckmann_function::parametersJacobian(const vec& x) const
 				 const double a2   = a*a;
 				 const double dh2  = h[2]*h[2];
 				 const double expo = exp((dh2 - 1.0) / (a2 * dh2));
-				 const double fac  = (4.0 * x[2]*x[5] * M_PI * a2 * dh2*dh2);
+				 const double fac  = (4.0 /* x[2]*x[5] */* M_PI * a2 * dh2*dh2);
 
 				 // df / dk_s
 				 jac[i*nbParameters() + j*2+0] = /*g[i] */ expo / fac;
 
 				 // df / da_x
-				 jac[i*nbParameters() + j*2+1] = -/* g[i] */ _ks[i] * (expo/(4.0*x[2]*x[5])) * ((2* a * h[2])/(M_PI*a2*a2*dh2)) * (1 + (dh2 - 1.0)*h[2]/(a2*dh2*h[2]));
+				 jac[i*nbParameters() + j*2+1] = -/* g[i] */ _ks[i] * (expo/(4.0/*x[2]*x[5]*/)) * ((2* a * h[2])/(M_PI*a2*a2*dh2)) * (1 + (dh2 - 1.0)*h[2]/(a2*dh2*h[2]));
 			 }
 			 else
 			 {

sources/plugins/nonlinear_function_retrobeckmann/function.h

@@ -34,9 +34,6 @@ class beckmann_function : public nonlinear_function
 		virtual vec operator()(const vec& x) const ;
 		virtual vec value(const vec& x) const ;
 
-		// Geometrical term of the microfacets
-		virtual vec G(const vec& x) const;
-
 		//! \brief Load function specific files
 		virtual bool load(std::istream& in) ;
 

sources/plugins/plugins.pro

@@ -18,6 +18,7 @@ SUBDIRS  = \
 				nonlinear_fresnel_normalized_schlick	\
 				nonlinear_fresnel_retroschlick			\
 				nonlinear_function_diffuse					\
+				nonlinear_function_microfacets			\
 				nonlinear_function_beckmann				\
 				nonlinear_function_retrobeckmann			\
 				nonlinear_function_blinn					\

sources/tests/unitary-proj-params.py

@@ -79,7 +79,7 @@ for t in range(0,M):
 			if retrocos < 0.0:
 				retrocos = 0.0
 
-			val = blinn(cos, 300) + blinn(retrocos, 150);
+			val = blinn(cos, 300)# + blinn(retrocos, 150);
 
 			f.write(str(theta_i) + '\t' + str(x) + '\t' + str(y) + '\t' + str(val) + "\n");
 		#end