Commits · 1279207f0bc7370c1509aada26c916cb1af42807 · David Cazier / CGoGN

03 Mar, 2015 2 commits
- SCHNApps compile with new structure · 1279207f
  Sylvain Thery authored Feb 10, 2015
  
  1279207f
- move CGoGN files:src,include in CGoGN · 800a66a3
  Sylvain Thery authored Feb 10, 2015
  
  800a66a3
17 Feb, 2015 2 commits
- Merge branch 'develop' into 'develop' · a82493fa
  Pierre Kraemer authored Feb 17, 2015
```
Develop

See merge request !46
```
  a82493fa
- SCHNApps - Surface Radiance : switch between per vertex and per fragment color evaluation · fabd57e6
  Pierre Kraemer authored Feb 17, 2015
  
  fabd57e6
16 Feb, 2015 3 commits
- SCHNApps : toggle automatic snapshots using the 'S' key · d13f94c0
  Pierre Kraemer authored Feb 16, 2015
  
  d13f94c0
- Merge branch 'develop' into 'develop' · a523c182
  Pierre Kraemer authored Feb 16, 2015
```
Develop

See merge request !45
```
  a523c182
- SCHNApps - surface Radiance : append "half" or "full" in export file names · 7c660fcf
  Pierre Kraemer authored Feb 16, 2015
  
  7c660fcf
13 Feb, 2015 4 commits
- Merge branch 'develop' into 'develop' · cc1bae49
  Pierre Kraemer authored Feb 13, 2015
```
Develop

See merge request !44
```
  cc1bae49
- add edgeSelectorRadiance files · f7173772
  Pierre Kraemer authored Feb 13, 2015
  
  f7173772
- Merge branch 'develop' into 'develop' · 32f4ff4e
  Pierre Kraemer authored Feb 13, 2015
```
Develop

See merge request !43
```
  32f4ff4e
- Full collapse decimation in Radiance plugin · 79056382
  Pierre Kraemer authored Feb 13, 2015
  
  79056382
12 Feb, 2015 1 commit
- allow export meshes during the decimation in Radiance Plugin · 4144a1be
  Pierre Kraemer authored Feb 12, 2015
  
  4144a1be
10 Feb, 2015 1 commit
- Réécriture de la mise à jour des erreurs par demi-arête après une contraction · 918098a5
  Pierre Kraemer authored Feb 10, 2015
  
  918098a5
09 Feb, 2015 1 commit
- First version of half-edge radiance error metric driven decimation · 0dd92877
  Pierre Kraemer authored Feb 09, 2015
  
  0dd92877
06 Feb, 2015 10 commits
- bad usage of single quotes.. · 3eab3531
  Pierre Kraemer authored Feb 06, 2015
  
  3eab3531
- Merge remote-tracking branch 'cgogn/develop' into develop · 652ebcbd
  Pierre Kraemer authored Feb 06, 2015
  
  652ebcbd
- Grosse mise à jour des Approximator / Selector + update plugin Radiance · 730a9724
  Pierre Kraemer authored Feb 06, 2015
  
  730a9724
- Merge branch 'develop' into 'develop' · 4dc1bdba
  Sylvain Thery authored Feb 06, 2015
```
Develop

See merge request !41
```
  4dc1bdba
- removing boost from SCHNApps · 280b6faa
  Sylvain Thery authored Feb 06, 2015
  
  280b6faa
- bug Zinri dylib compil · 05b4e1c7
  Thery Sylvain authored Feb 06, 2015
  
  05b4e1c7
- replace boost_regex by std::regex ! · adf41255
  Sylvain Thery authored Feb 06, 2015
  
  adf41255
- Merge icube-forge.unistra.fr:cgogn/cgogn into develop · d12298e1
  Sylvain Thery authored Feb 06, 2015
```
Conflicts:
	README.md
```
  d12298e1
- modif readme · 744f4d3f
  Sylvain Thery authored Feb 06, 2015
  
  744f4d3f
- Merge branch 'master' into 'develop' · 19976f90
  Sylvain Thery authored Feb 06, 2015
```
Master to Develop

Reverse merge (master -> develop) due to bad merge in master

See merge request !40
```
  19976f90
02 Feb, 2015 1 commit
- Merge branch 'master' into 'master' · 7114af20
  Sylvain Thery authored Feb 02, 2015
```
Master

once upon a time

See merge request !39
```
  7114af20
01 Feb, 2015 7 commits
- Merge branch 'develop' into 'develop' · 6ddae940
  Pierre Kraemer authored Feb 01, 2015
```
Bug fix in GLSLShader.cpp

See merge request !38
```
  6ddae940
- Merge branch 'develop' of icube-forge.unistra.fr:vanhoey/cgogn into develop · f3df2e7e
  kvanhoey authored Feb 01, 2015
  
  f3df2e7e
- More typo bugs in shader macros · 97655f87
  kvanhoey authored Feb 01, 2015
  
  97655f87
- Merge branch 'develop' of icube-forge.unistra.fr:vanhoey/cgogn into develop · 0327ae08
  kvanhoey authored Feb 01, 2015
  
  0327ae08
- Merge branch 'develop' of icube-forge.unistra.fr:vanhoey/cgogn into develop · 8986ccbe
  kvanhoey authored Feb 01, 2015
  
  8986ccbe
- bug in GLSLShader: #define PRECISON -> PRECISION (typo) · 16205b9e
  kvanhoey authored Feb 01, 2015
  
  16205b9e
- bug in GLSLShader: #define PRECISION -> PRECISION (typo · 64ea309a
  kvanhoey authored Feb 01, 2015
  
  64ea309a
31 Jan, 2015 2 commits
- Merge branch 'develop' into 'develop' · 16a8470d
  Pierre Kraemer authored Jan 31, 2015
```
Develop

See merge request !36
```
  16a8470d
- add symetrization in ShaderRadiancePerVertex + WallPaper in SCHNApps views · 2a010a38
  Pierre Kraemer authored Jan 31, 2015
  
  2a010a38
30 Jan, 2015 2 commits
- Merge branch 'develop' into 'develop' · 5fcb3fc3
  Pierre Kraemer authored Jan 30, 2015
```
Develop

See merge request !35
```
  5fcb3fc3
- Set spherical harmonics resolution at ShaderRadiancePerVertex construction · bc2e1c32
  Pierre Kraemer authored Jan 30, 2015
  
  bc2e1c32
29 Jan, 2015 2 commits
- Merge branch 'develop' into 'develop' · e66c4530
  Pierre Kraemer authored Jan 29, 2015
```
Develop

add spherical harmonics + surface radiance shader & SCHNApps plugin

See merge request !34
```
  e66c4530
- SCHNApps: new surface_radiance plugin · c32aa9d5
  Pierre Kraemer authored Jan 29, 2015
```
+ add shader RadiancePerVertex in CGoGN
+ add spherical harmonics in CGoGN
```
  c32aa9d5
27 Jan, 2015 2 commits
- Merge branch 'develop' into 'master' · 21e86c78
  Lionel Untereiner authored Jan 27, 2015
```
Develop

See merge request !1
```
  21e86c78
- old fashioned IHM3 are back · a0a2dc32
  Lionel Untereiner authored Jan 27, 2015
  
  a0a2dc32