Skip to content

Commit

Permalink
Fix misc. typos (#309)
Browse files Browse the repository at this point in the history
  • Loading branch information
luzpaz authored and rolandjitsu committed Feb 19, 2018
1 parent c6756f0 commit 844bcf6
Show file tree
Hide file tree
Showing 22 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions brayns/Brayns.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace brayns
in the rendering parameters and is invoked by the render method for
generating the frames.
Underlying rendering engines support CPU, GPU and heterogenous architectures
Underlying rendering engines support CPU, GPU and heterogeneous architectures
This object exposes the basic API for Brayns
*/
Expand All @@ -65,7 +65,7 @@ class Brayns

/**
Renders color and depth buffers of the current scene, according to
default parameters. This is typicaly used by an application that does
default parameters. This is typically used by an application that does
not provide any on-screen visualization. In such cases, input and output
parameters are provided by network events. For instance, a camera event
defines the origin, target and up vector of the camera, and an ImageJPEG
Expand Down
2 changes: 1 addition & 1 deletion brayns/common/camera/Camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class Camera : public BaseObject
CameraStereoMode getStereoMode() const { return _stereoMode; }
/**
@brief Sets the eye separation of the stereo camera
@param eyeSeparation The new distance bewteen eyes
@param eyeSeparation The new distance between eyes
*/
void setEyeSeparation(float eyeSeparation)
{
Expand Down
4 changes: 2 additions & 2 deletions brayns/common/engine/Engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ struct SnapshotParams
* ray-tracing engine is a 3rd party acceleration library, typically OSPRay,
* Optix or FireRays, that provides hardware acceleration.
* An engine holds a native implementation of a scene, a camera, a frame buffer
* and of one or serveral renderers according to the capatilities of the
* and of one or several renderers according to the capatilities of the
* acceleration library.
*/
class Engine
{
public:
/**
* @brief Engine contructor
* @brief Engine constructor
* @param parametersManager holds all engine parameters (geometry,
* rendering, etc)
*/
Expand Down
2 changes: 1 addition & 1 deletion brayns/common/material/Material.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Material
const std::string& filename);

/* @brief Prevents material attributes to be updated. Any update will be
* ignored. This is used when one wants to avoid material attibutes to be
* ignored. This is used when one wants to avoid material attributes to be
* modifiied during the life time of the scene
*/
BRAYNS_API void lock() { _locked = true; }
Expand Down
2 changes: 1 addition & 1 deletion brayns/common/simulation/AbstractSimulationHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AbstractSimulationHandler
{
public:
/**
* @brief Default contructor
* @brief Default constructor
* @param geometryParameters Geometry parameters
*/
AbstractSimulationHandler(const GeometryParameters& geometryParameters);
Expand Down
2 changes: 1 addition & 1 deletion brayns/common/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ struct Histogram
bool empty() const { return values.empty(); }
};

/** Some 'special' materials are used by Brayns to acomplish specific features
/** Some 'special' materials are used by Brayns to accomplish specific features
* such as skyboxes.
*/
const size_t NO_MATERIAL = std::numeric_limits<size_t>::max();
Expand Down
6 changes: 3 additions & 3 deletions brayns/io/MorphologyLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ class MorphologyLoader::Impl
* not apply
* @param compartmentReport Compartment report to map to the morphology
* @param scene Scene to which the morphology should be loaded into
* @return True if the loading was successfull, false otherwise
* @return True if the loading was successful, false otherwise
*/
bool _importMorphologyAsPoint(const uint64_t index, const size_t material,
const Matrix4f& transformation,
Expand Down Expand Up @@ -488,7 +488,7 @@ class MorphologyLoader::Impl
* @param material Material that is forced in case geometry parameters
* do not apply
* @param scene Scene to which the morphology should be loaded into
* @return True if the loading was successfull, false otherwise
* @return True if the loading was successful, false otherwise
*/
bool _createRealisticSoma(const servus::URI& uri, const uint64_t index,
const size_t material,
Expand Down Expand Up @@ -579,7 +579,7 @@ class MorphologyLoader::Impl
* do not apply
* @param compartmentReport Compartment report to map to the morphology
* @param scene Scene to which the morphology should be loaded into
* @return True if the loading was successfull, false otherwise
* @return True if the loading was successful, false otherwise
*/
bool _importMorphologyFromURI(const servus::URI& uri, const uint64_t index,
const size_t material,
Expand Down
4 changes: 2 additions & 2 deletions brayns/io/NESTLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,9 @@ bool NESTLoader::_load(const float timestamp)
for (size_t i = 0; i < _nbElements; ++i)
{
const float time = _values[i];
// Whith the next check, simulation only plays forward because the value
// With the next check, simulation only plays forward because the value
// that is stored
// is the last time the spike occured for this neuron.
// is the last time the spike occurred for this neuron.
if (time < start)
continue;

Expand Down
2 changes: 1 addition & 1 deletion brayns/io/ProteinLoader.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ProteinLoader
* @param position Position of protein in space
* @param proteinIndex Index of the protein when more than one is loaded
* @param scene Resulting scene
* @return true if PDB file was successufully loaded, false otherwize
* @return true if PDB file was successufully loaded, false otherwise
*/
bool importPDBFile(const std::string& filename, const Vector3f& position,
const size_t proteinIndex, Scene& scene);
Expand Down
2 changes: 1 addition & 1 deletion brayns/io/simulation/CADiffusionSimulationHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class CADiffusionSimulationHandler
{
public:
/**
* @brief Default contructor
* @brief Default constructor
* @param simulationFolder Folder containing files with the CA atom
* positions. Files must have a .dat extension.
*/
Expand Down
2 changes: 1 addition & 1 deletion brayns/io/simulation/CircuitSimulationHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CircuitSimulationHandler : public AbstractSimulationHandler
{
public:
/**
* @brief Default contructor
* @brief Default constructor
* @param geometryParameters Geometry parameters
* @param reportSource path to report source
* @param gids GIDS to load
Expand Down
2 changes: 1 addition & 1 deletion brayns/io/simulation/SpikeSimulationHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SpikeSimulationHandler : public AbstractSimulationHandler
{
public:
/**
* @brief Default contructor
* @brief Default constructor
* @param geometryParameters Geometry parameters
*/
SpikeSimulationHandler(const GeometryParameters& geometryParameters);
Expand Down
2 changes: 1 addition & 1 deletion brayns/parameters/GeometryParameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class GeometryParameters : public AbstractParameters
const std::string& getXYZBFile() const { return _xyzbFile; }
/** folder containing mesh files */
const std::string& getMeshFolder() const { return _meshFolder; }
/** Fesh containting mesh*/
/** Fesh containing mesh*/
const std::string& getMeshFile() const { return _meshFile; }
/** file containing circuit configuration */
const std::string& getCircuitConfiguration() const
Expand Down
2 changes: 1 addition & 1 deletion ospray_modules/optix/Device.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ struct Device : public ospray::api::Device
/*! create a new renderer object (out of list of registered renderers) */
OSPRenderer newRenderer(const char *type) override;

/*! create a new geometry object (out of list of registered geometrys) */
/*! create a new geometry object (out of list of registered geometries) */
OSPGeometry newGeometry(const char *type) override;

/*! have given renderer create a new material */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <optixu/optixu_math_namespace.h>

// Plane intersection -- used for refining triangle hit points. Note
// that this skips zero denom check (for rays perpindicular to plane normal)
// that this skips zero denom check (for rays perpendicular to plane normal)
// since we know that the ray intersects the plane.
static __device__ __inline__ float intersectPlane(
const optix::float3& origin, const optix::float3& direction,
Expand Down
2 changes: 1 addition & 1 deletion ospray_modules/optix/framebuffer/FrameBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct FrameBuffer : public ospray::FrameBuffer
~FrameBuffer();

//! \brief common function to help printf-debugging
/*! \detailed Every derived class should overrride this! */
/*! \detailed Every derived class should override this! */
std::string toString() const override;

void setTile(ospray::Tile &tile) override;
Expand Down
4 changes: 2 additions & 2 deletions plugins/engines/EngineFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
namespace brayns
{
/**
* The engine factory is in charge of instanciating engines according to their
* The engine factory is in charge of instantiating engines according to their
* name (ospray, optix or firerays). If Brayns does not find the 3rd party
* library at compilation time, the according lib is not generated and the
* get method returns a null pointer.
Expand All @@ -49,7 +49,7 @@ class EngineFactory
* the name is incorrect, a null pointer is returned.
* @param name of the engine (opray, optix)
* @return A pointer to the engine, null if the engine could not be
* instanciated
* instantiated
*/
std::unique_ptr<Engine> create(EngineType name);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct OSPRAY_SDK_INTERFACE ClippedPerspectiveCamera : public Camera
ClippedPerspectiveCamera();

//! \brief common function to help printf-debugging
/*! Every derived class should overrride this! */
/*! Every derived class should override this! */
virtual std::string toString() const
{
return "ospray::ClippedPerspectiveCamera";
Expand Down
2 changes: 1 addition & 1 deletion plugins/engines/ospray/ispc/render/ParticleRenderer.ispc
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ inline vec3f ParticleRenderer_shadeRay(
if (depth == 0)
sample.alpha = 1.f;

// Retreive information about the geometry, typically geometry ID,
// Retrieve information about the geometry, typically geometry ID,
// normal to the surface, material ID, texture coordinates, etc.
DifferentialGeometry dg;
postIntersect(self->abstract.super.model, dg, ray,
Expand Down
2 changes: 1 addition & 1 deletion plugins/engines/ospray/ispc/render/ProximityRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace brayns
intersection point of the surface.
This renderer can be configured using the following entries:
- detectionDistance: Maximum distance for surrouding geometry detection
- detectionDistance: Maximum distance for surrounding geometry detection
- materialTestEnabled: If true, detection will be disabled for geometry that
has the same material as the hit surface.
- electronShadingEnabled: If true, geometries are renderered using the
Expand Down
4 changes: 2 additions & 2 deletions plugins/engines/ospray/ispc/render/SimulationRenderer.ispc
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ inline void processSimulationValue(ShadingAttributes& attributes,
}

/**
The purpose of the processSimulationContribution function is to retreive the
The purpose of the processSimulationContribution function is to retrieve the
value of the simulation from a secondary model attached to the OSPRay scene.
The geometry is defined by the primary model, but the shading is computed
according to a second, non-visible model that contains the simulation values.
Expand Down Expand Up @@ -505,7 +505,7 @@ inline vec3f SimulationRenderer_shadeRay(

if (attributes.opacity > 0.01f && moreRebounds)
{
// Compute indirect lightening contribution
// Compute indirect lighting contribution
computeIndirectShading(sample, attributes);

// Compute surface shading
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ inline bool indirectShading(const uniform AbstractRenderer* uniform self,
indirectShadingPower = reduce_max(Ka);
}

// Returned color is the one material with weigth according
// Returned color is the one material with weight according
// intensity and distance to intersection
indirectShadingColor = localDiffuseColor * Ka;
indirectShadingPower /= distanceToIntersection;
Expand Down

0 comments on commit 844bcf6

Please sign in to comment.