Diffusion symkit b4b30c04c67d

symkit_prog
b4b30c04c67d
Actions

Authored by Cincotti on May 4 2018, 21:20.

Description

Merge branch 'master' of ssh://c4science.ch/source/symkit_prog

Details

Committed

Cincotti

May 4 2018, 21:20

Pushed

Cincotti

May 4 2018, 21:21

Parents

rSYMKITce3af5a34ef1: Amelioré affiche Vector
rSYMKIT60db47f7471e: merge from master

Branches

Unknown

Tags

Unknown

Event Timeline

Cincotti committed rSYMKITb4b30c04c67d: Merge branch 'master' of ssh://c4science.ch/source/symkit_prog (authored by Cincotti).May 4 2018, 21:20

Merged Changes

Commit	Author	Details	Committed
60db47f7471e	ancarola	merge from master	May 4 2018
3a6e8c4b3eab	ancarola	Now plotting worksgit add ./!	May 4 2018
56d388fa43d8	ancarola	Plotting initialized but still not working	May 4 2018
62aa89540371	ancarola	Conception organized	Apr 29 2018

Changes (61)

		Path
M		alpha/assets.h
M		alpha/marbled.cpp
M		alpha/newtonsphere.cpp
M		alpha/pendule.cpp
M		alpha/pendulecoupl.cpp
M		alpha/ressor.cpp
M		beta/assets.h
M		beta/beta.pro
M		beta/betascene.cpp
M		beta/betascene.h
M		beta/main.cpp
M		beta/marbled.cpp
M		beta/newtonsphere/newtonsphere.cpp
M		beta/pendcouple/pendcouple.cpp
M		beta/pendcouple/pendcouple.h
M		beta/pendressort/penduleressort.cpp
M		beta/pendules/pendule.cpp
M		beta/ressort/ressor.cpp
V		doc/{ → conception}/BozzaConception.txt
V		doc/{Conception.pdf → conception/conception.pdf}
A	(dir)	doc/conception/
V		doc/{conception ← }/BozzaConception.txt
V		{doc/conception/conception.aux ← templates/documentation/documentation.aux}
V		{doc/conception/conception.log ← templates/documentation/documentation.log}
V		doc/{conception/conception.pdf ← Conception.pdf}
V		{doc/conception/conception.tex ← templates/documentation/documentation.tex}
A		doc/conception/conception.toc
A		symath/skutils.h
M		symath/symath.pro
M		symgraph/actors/particlesystem.cpp
M		symgraph/actors/shape.cpp
M		symgraph/actors/systems/interactingsystem.cpp
M		symgraph/glmodel.cpp
V		symgraph/{graphtools.h ← sktools.h}
M		symgraph/scene.cpp
M		symgraph/scene.h
M		symgraph/scenewrapper.cpp
M		symgraph/sktools.cpp
V		symgraph/{sktools.h → graphtools.h}
M		symgraph/specs/colorable.h
M		symgraph/symgraph.pro
V		symplot/{fragment_shader.glsl → plot_fragment_shader.glsl}
V		symplot/{plot_fragment_shader.glsl ← fragment_shader.glsl}
A		symplot/plot_shaders.qrc
V		symplot/{plot_vertex_shader.glsl ← vertex_shader.glsl}
M		symplot/plotdata.h
A		symplot/plotstream.h
A		symplot/plotutils.h
D		symplot/shaders.qrc
A		symplot/skplot.cpp
M		symplot/skplot.h
A		symplot/skplot2d.cpp
A		symplot/skplot2d.h
M		symplot/symplot.pro
V		symplot/{vertex_shader.glsl → plot_vertex_shader.glsl}
D		templates/documentation
V		{templates/documentation/documentation.aux → doc/conception/conception.aux}
V		{templates/documentation/documentation.log → doc/conception/conception.log}
D		templates/documentation/documentation.pdf
V		{templates/documentation/documentation.tex → doc/conception/conception.tex}
D		templates/documentation/documentation.toc