Commit 0df061df authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 18.06.00+dfsg

parent 666b7a9d

.gitattributes

0 → 100644
+26 −0
Original line number Diff line number Diff line 


# Explicitly declare text files we want to always be normalized and converted

# to native line endings on checkout.



## C/C++/Cuda code

*.h text

*.c text

*.cpp text

*.inl text

*.hpp text



## Cuda

*.cu text



## Shaders

*.frag text

*.vert text

*.glsl text



## Scenes

*.scn text

*.xml text



## Scripts

*.sh text

*.awk text

.github/ISSUE_TEMPLATE.md

0 → 100644
+7 −0
Original line number Diff line number Diff line 








______________________________________________________



Suggested labels: <!--- see https://github.com/sofa-framework/sofa/labels -->
 
 No newline at end of file

.github/PULL_REQUEST_TEMPLATE.md

0 → 100644
+16 −0
Original line number Diff line number Diff line 










______________________________________________________

<!--- Please leave this at the end of your message -->

This PR: 

- [ ] builds with SUCCESS for all platforms on the CI.

- [ ] does not generate new warnings.

- [ ] does not generate new unit test failures.

- [ ] does not generate new scene test failures.

- [ ] does not break API compatibility.

- [ ] is more than 1 week old (or has fast-merge label).



**Reviewers will merge only if all these checks are true.**

.gitignore

0 → 100644
+50 −0
Original line number Diff line number Diff line 
# Lines that begin with '#' are comments.



# Ignore foo.txt file

#foo.txt



# Ignore all html file

#*.html



# except foo.html which is maintain by hand

#!foo.html



# Ignore all objets and archives

#*.[oa]





########## GITIGNORE SOFA ##############



# vim journal files

.*.swp

.*.swo



# git diff temporary files

*.orig



# Backup files

*~



# Python byte code

*.pyc



# Files generated by OS X

.DS_Store



# Misc

/applications/plugins/EmptyPlugin

/applications-dev



# Files created by QtCreator

CMakeLists.txt.user*



# custom cmake file

custom.cmake



# Ignore other .gitignore

.gitignore



# anything user-specific (as opposed to repository-specific) should go

# to .git/info/exclude instead of .gitignore. Also, .gitignore files

# can be placed in sub-directories to avoid polluting the root one.

Authors.txt

+33 −6
Original line number Diff line number Diff line 
/**************************************************************************

*     SOFA, Simulation Open-Framework Architecture, version 1.0 beta 4    *

*              (c) 2006-2009 MGH, INRIA, USTL, UJF, CNRS                  *

*      SOFA, Simulation Open-Framework Architecture, development version  *

*              (c) 2006-2017 INRIA, USTL, UJF, CNRS, MGH                  *

*                                                                         *

*                              CONTRIBUTORS                               *

*                                                                         *
@@ -15,20 +15,40 @@ 
        Jeremie Allard

        Barbara Andre

        Pierre-Jean Bensoussan

        Guillaume Bousquet

        Frederic Chateau

        Hadrien Courtecuisse

        Olivier Comas

        Stephane Cotin

        Jeremie Dequidt

        Marie Durand

        Christian Duriez

        Herve Delingette

        Florent Falipou

        Francois Faure

        Sylvere Fonteneau

        Christophe Guebert

        Laure Heigeas

        Tobias Heimann

        Everton Hermann

        Jeremy Jaussaud

        Lenka Jerabkova

        Francois Jourdes

        Hoeryong Jung

        Vincent Majorczyk

        Stephanie Marchesseau

        Cesar Mendoza

        Matthieu Nesme

        Paul Neumann

        Chi-Thanh Nguyen

        Marek Olsak

        Erik Pernod

        Igor Peterlik

        Juan Pablo de la Plata Alcalde

        Francois Poyer

        Frederick Roy

        Hugo Talbot

        Moreno Trlin



:: SOFA Modules ::
@@ -39,7 +59,7 @@ 
        Matthieu Nesme and Francois Faure



    + Dynamic Topologies

        Barbara Andre and Herve Delingette

        Barbara Andre, Herve Delingette, Erik Pernod



    + Tetrahedral volume rendering

        Sebastien Barbier and George-Pierre Bonneau
@@ -51,4 +71,11 @@ 
        Juan Pablo de la Plata Alcalde, Christian Duriez



    + GPU support using CUDA

        Jeremie Allard
 
        Jeremie Allard, Hadrien Courtecuisse



    + GPU support using OpenCL

        Jeremie Allard, Vincent Majorczyk



    + Geomagic Interface

        Hadrien Courtecuisse

        Raffaela Trivisonne
 
 No newline at end of file