Skip to content

Commit

Permalink
fix to readme, enhance readability of doxytags for WRATHGradientSourc…
Browse files Browse the repository at this point in the history
…eBase and WRATHtextureCoordinateSourceBase and add missing bold to doxytag in WRATHShaderBrushSourceHoard
  • Loading branch information
kevin-rogovin committed Aug 30, 2013
1 parent dda76d9 commit 83be426
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.1st
Expand Up @@ -35,7 +35,7 @@ Documentation
WRATH has doxygen documentation complete with tutorials and overview text, WRATH has doxygen documentation complete with tutorials and overview text,
build the documentation with: build the documentation with:


#cd docs; make #cd docs && make


and find it at docs/doxy/html/index.html and find it at docs/doxy/html/index.html


Expand All @@ -46,7 +46,7 @@ Porting WRATH
Most of WRATH's source code is standard vanilla C/C++ code. Most of WRATH's source code is standard vanilla C/C++ code.
The main issues of which to be aware are: The main issues of which to be aware are:
- GL version and GL header files. This is the NGL system. You will - GL version and GL header files. This is the NGL system. You will
need to hack ngl/Rules.ml for a new target to where the GL/GLES need to hack ngl/Rules.mk for a new target to where the GL/GLES
header files are located In addition, you will need to set header files are located In addition, you will need to set
correctly the GL/GLES version, in Makefile.settings, correctly the GL/GLES version, in Makefile.settings,
the variable GL_VERSION the variable GL_VERSION
Expand Down
14 changes: 8 additions & 6 deletions inc/WRATH/image/WRATHGradientSourceBase.hpp
Expand Up @@ -51,8 +51,8 @@ namespace WRATHGradientSourceBasePrivate
interpolation_behaviour_t interpolation_behaviour_t
- A gradient interpolate is implemented in GLSL by - A gradient interpolate is implemented in GLSL by
implementing 2 functions: pre_compute_gradient() implementing 2 functions: <B>pre_compute_gradient()</B>
and compute_gradient(). and <B>compute_gradient()</B>.
The interpolation behavior can be linear, partially-nonlinear The interpolation behavior can be linear, partially-nonlinear
and fully non-linear. The caller requests the nature and fully non-linear. The caller requests the nature
Expand All @@ -79,7 +79,8 @@ namespace WRATHGradientSourceBasePrivate
\code \code
void pre_compute_gradient(in vec2 p) void pre_compute_gradient(in vec2 p)
\endcode \endcode
in the vertex shader and the function in the vertex shader.\n\n
Also implement the function
\code \code
vec2 compute_gradient(in vec2 p) vec2 compute_gradient(in vec2 p)
\endcode \endcode
Expand All @@ -99,7 +100,8 @@ namespace WRATHGradientSourceBasePrivate
\code \code
void pre_compute_gradient(void) void pre_compute_gradient(void)
\endcode \endcode
in the vertex shader and the function in the vertex shader.\n\n
Also implement the function
\code \code
vec2 compute_gradient(in vec2 p) vec2 compute_gradient(in vec2 p)
\endcode \endcode
Expand Down Expand Up @@ -176,7 +178,7 @@ class WRATHGradientSourceBase:public WRATHBaseSource
\param prec precision qaulifier to use \param prec precision qaulifier to use
\param suffix suffix to which to append to all function, macros, etc \param suffix suffix to which to append to all function, macros, etc
added to the GLSL code, including the functions added to the GLSL code, including the functions
compute_gradient() and pre_compute_gradient(). <B>compute_gradient()</B> and <B>pre_compute_gradient()</B>.
A non-empty suffix indicates that the functions A non-empty suffix indicates that the functions
are being chained from another function, in this are being chained from another function, in this
case none of the macros LINEAR_GRADIENT, NON_LINEAR_GRADIENT case none of the macros LINEAR_GRADIENT, NON_LINEAR_GRADIENT
Expand Down Expand Up @@ -220,7 +222,7 @@ class WRATHGradientSourceBase:public WRATHBaseSource
\param prec precision qaulifier to use \param prec precision qaulifier to use
\param suffix suffix to which to append to all symbols of GLSL shaders \param suffix suffix to which to append to all symbols of GLSL shaders
that are at global scope, including the functions that are at global scope, including the functions
compute_gradient() and pre_compute_gradient() <B>compute_gradient()</B> and <B>pre_compute_gradient()</B>
*/ */
virtual virtual
void void
Expand Down
2 changes: 1 addition & 1 deletion inc/WRATH/image/WRATHShaderBrushSourceHoard.hpp
Expand Up @@ -74,7 +74,7 @@ class WRATHShaderBrushSourceHoard:boost::noncopyable
- <B>void wrath_shader_brush_prepare()</B> in the - <B>void wrath_shader_brush_prepare()</B> in the
vertex shader to perform any pre-compute stages of vertex shader to perform any pre-compute stages of
the gradient and image the gradient and image
- vec4 wrath_shader_brush_color(in vec2 p) in the fragment - <B>vec4 wrath_shader_brush_color(in vec2 p)</B> in the fragment
shader taking as input the brush coordinate to feed shader taking as input the brush coordinate to feed
to image and gradient. If the brush dictates that the to image and gradient. If the brush dictates that the
fragment should not be drawn, issues a discard. Also defines fragment should not be drawn, issues a discard. Also defines
Expand Down
12 changes: 8 additions & 4 deletions inc/WRATH/image/WRATHTextureCoordinateSourceBase.hpp
Expand Up @@ -69,7 +69,8 @@ namespace WRATHTextureCoordinateSourceBasePrivate
\code \code
void pre_compute_texture_coordinate(in vec2 p) void pre_compute_texture_coordinate(in vec2 p)
\endcode \endcode
in the vertex shader and the function in the vertex shader.\n\n
Also implement the function
\code \code
vec2 compute_texture_coordinate(in vec2 p) vec2 compute_texture_coordinate(in vec2 p)
\endcode \endcode
Expand All @@ -83,7 +84,8 @@ namespace WRATHTextureCoordinateSourceBasePrivate
\code \code
void pre_compute_texture_coordinate(void) void pre_compute_texture_coordinate(void)
\endcode \endcode
in the vertex shader and the function in the vertex shader.\n\n
Also implement the function
\code \code
vec2 compute_texture_coordinate(in vec2 p) vec2 compute_texture_coordinate(in vec2 p)
\endcode \endcode
Expand Down Expand Up @@ -140,7 +142,8 @@ class WRATHTextureCoordinateSourceBase:public WRATHBaseSource
\param prec precision qaulifier to use \param prec precision qaulifier to use
\param suffix suffix to which to append to all function, macros, etc \param suffix suffix to which to append to all function, macros, etc
added to the GLSL code, including the functions added to the GLSL code, including the functions
compute_texture_coordinate() and pre_compute_texture_coordinate(). <B>compute_texture_coordinate()</B> and
<B>pre_compute_texture_coordinate()</B>.
A non-empty suffix indicates that the functions A non-empty suffix indicates that the functions
are being chained from another function, in this are being chained from another function, in this
case none of the macros LINEAR_TEXTURE_COORDINATE, case none of the macros LINEAR_TEXTURE_COORDINATE,
Expand Down Expand Up @@ -187,7 +190,8 @@ class WRATHTextureCoordinateSourceBase:public WRATHBaseSource
\param prec precision qaulifier to use \param prec precision qaulifier to use
\param suffix suffix to which to append to all symbols of GLSL shaders \param suffix suffix to which to append to all symbols of GLSL shaders
that are at global scope, including the functions that are at global scope, including the functions
compute_texture_coordinate() and pre_compute_texture_coordinate(). <B>compute_texture_coordinate()</B> and
<B>pre_compute_texture_coordinate()</B>.
*/ */
virtual virtual
void void
Expand Down

0 comments on commit 83be426

Please sign in to comment.