Compare commits
12 Commits
b48d304080
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f4294f08f | ||
|
|
933b6d790c | ||
|
|
edf69cbd6d | ||
|
|
8381cc1035 | ||
|
|
c8fe6b6dae | ||
|
|
8ba874099b | ||
|
|
6b211514d0 | ||
|
|
a2e3505c76 | ||
|
|
be37066adc | ||
|
|
07b7f21922 | ||
|
|
e244b5980d | ||
|
|
516b6ca450 |
15
.gitlab-ci.yml
Normal file
15
.gitlab-ci.yml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
deploy-projects.rismer.de:
|
||||||
|
stage: deploy
|
||||||
|
script:
|
||||||
|
- mkdir .public
|
||||||
|
- cp -r * .public
|
||||||
|
- mv .public public
|
||||||
|
- cp -r public/* /var/www/projects.rismer.de/
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- public
|
||||||
|
environment:
|
||||||
|
name: deploy-staging
|
||||||
|
url: https://projects.rismer.de
|
||||||
|
only:
|
||||||
|
- master
|
||||||
@@ -6,6 +6,17 @@ body {
|
|||||||
.card {
|
.card {
|
||||||
background-color: #006494;
|
background-color: #006494;
|
||||||
margin-top: 5%;
|
margin-top: 5%;
|
||||||
|
min-height: 520px;
|
||||||
|
max-height: 520px;
|
||||||
|
padding-bottom: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-footer {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
position: absolute;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fixs {
|
.fixs {
|
||||||
@@ -33,6 +44,8 @@ body {
|
|||||||
top:10%;
|
top:10%;
|
||||||
background-color: rgba(255, 255, 255, .15);
|
background-color: rgba(255, 255, 255, .15);
|
||||||
backdrop-filter: blur(5px);
|
backdrop-filter: blur(5px);
|
||||||
|
-webkit-backdrop-filter: blur(5px);
|
||||||
|
-moz-backdrop-filter: blur(5px);
|
||||||
-webkit-box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
-webkit-box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
||||||
-moz-box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
-moz-box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
||||||
box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
box-shadow: 9px 6px 29px -3px rgba(0,0,0,0.75);
|
||||||
|
|||||||
BIN
images/bsc.png
Normal file
BIN
images/bsc.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 119 KiB |
BIN
images/darkrp.png
Normal file
BIN
images/darkrp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
BIN
images/darkrpserver.png
Normal file
BIN
images/darkrpserver.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
images/leaflet.png
Normal file
BIN
images/leaflet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 146 KiB |
BIN
images/phong-shading.gif
Normal file
BIN
images/phong-shading.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 744 KiB |
BIN
images/webOcean.png
Normal file
BIN
images/webOcean.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
168
index.html
168
index.html
@@ -14,62 +14,198 @@
|
|||||||
<!-- OWN CSS -->
|
<!-- OWN CSS -->
|
||||||
<link rel="stylesheet" type="text/css" href="css/style.css">
|
<link rel="stylesheet" type="text/css" href="css/style.css">
|
||||||
|
|
||||||
<title>Nothing to see here.</title>
|
<title>Projekte</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div class="container-fluid position-relative header">
|
<div class="container-fluid position-relative header">
|
||||||
<div class="blurred"></div>
|
<div class="blurred p-3">
|
||||||
<h4 class="position-absolute font-italic" style="bottom:5px;right:25px;">TEST</h4>
|
<h3 class="text-light">Projekte</h3>
|
||||||
|
<p class="text-light">Auf dieser sind meine privat-, hobby- sowie Hochschulprojekte aufgeführt.</p>
|
||||||
|
<h4 class="text-light">Legende</h4>
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th style="min-width:100px;"><i class="fa fa-2x fa-play text-success"></i></th>
|
||||||
|
<td class="text-light">aktiv in Entwicklung</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="min-width:100px;"><i class="fa fa-2x fa-pause text-warning"></i></th>
|
||||||
|
<td class="text-light">vorerst pausiert</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="min-width:100px;"><i class="fa fa-2x fa-stop text-danger"></i></th>
|
||||||
|
<td class="text-light">abgebrochen</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="min-width:100px;"><i class="fa fa-2x fa-check text-success"></i></th>
|
||||||
|
<td class="text-light">abgeschlossen</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<h4 class="position-absolute font-italic text-secondary" style="bottom:5px;right:25px;">ebenfalls ein Hobby von mir
|
||||||
|
ist Fotografie.</h4>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container-fluid p-2">
|
<div class="container-fluid p-2">
|
||||||
<div class="row row-cols-1 mx-auto">
|
<div class="row row-cols-1 mx-auto">
|
||||||
<div class="col fixs">
|
<div class="col fixs">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<img class="card-img-top" src="https://via.placeholder.com/150x80" alt="Card image cap">
|
<img class="card-img-top" height="200" src="images/webOcean.png" alt="Card image cap">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title text-light">Web-Ocean</h5>
|
<h5 class="card-title text-light">Web-Ocean</h5>
|
||||||
<p class="card-text text-light">Ein Typescript-Port des Ocean C++ Projekts. Herausfordernd ist die Begrenzung von OpenGL auf webgl wodurch keine compute Shader zur Verfügung stehen.</p>
|
<p class="card-text text-light">Ein Typescript-Port des C-Ocean Projekts aktuell beschränkt auf ein
|
||||||
<i class="fa fa-2x fa-git-square"></i>
|
Wasser-Patch. Interessant ist die Aufteilung in zwei Render-Phasen unter Verwendung von Displacement-Maps
|
||||||
|
im Gegensatz zum ursprünglichen Projekt.</p>
|
||||||
|
<p class="card-text text-light">#Typescript, #webGL2, #CG</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
<i class="fa fa-2x fa-play text-success"></i>
|
<i class="fa fa-2x fa-play text-success"></i>
|
||||||
|
<a href="web-ocean">Live-Demo</a>
|
||||||
|
<a href="https://git.rismer.de/gulum/web-ocean"><i class="fa fa-2x fa-git-square float-right"></i></a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col fixs">
|
||||||
|
<div class="card">
|
||||||
|
<img class="card-img-top" height="200" src="images/bsc.png" alt="Card image cap">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">C-Ocean</h5>
|
||||||
|
<p class="card-text text-light"> Simulation eines Ozeans in C. Für die Wellenbewebung wurde Perlin Noise
|
||||||
|
eingesetzt. In der Frustum Culling-Ansicht.</p>
|
||||||
|
<p class="card-text text-light">#C, #OpenGL, #CG</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<a href="data/bsc.pdf"><i class="fa fa-2x fa-file-pdf-o float-right"></i></a>
|
||||||
|
<a href="https://git.rismer.de/gulum/c-ocean"><i class="fa fa-2x fa-git-square float-right"></i></a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col fixs">
|
||||||
|
<div class="card">
|
||||||
|
<img class="card-img-top" height="200" src="https://via.placeholder.com/400x200" alt="Card image cap">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">Verbesserung der Textur eines 3D-Modells erzeugt durch einen 3D-Scanner
|
||||||
|
</h5>
|
||||||
|
<p class="card-text text-light">Ein Projekt welches ich während meiner Masterarbeit bei der Firma Vitronic
|
||||||
|
bearbeitet habe. </p>
|
||||||
|
<p class="card-text text-light">#C++, #OpenGL, #Photogrammetrie</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<i class="fa fa-2x fa-file-pdf-o float-right"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col fixs">
|
||||||
|
<div class="card">
|
||||||
|
<img class="card-img-top" height="200" src="images/darkrp.png" alt="Card image cap">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">DarkRP2D</h5>
|
||||||
|
<p class="card-text text-light">Ein Hobby-Projekt von mir an dem ich arbeite wenn sonst keine Projekte
|
||||||
|
anstehen.</p>
|
||||||
|
<p class="card-text text-light">#C++, #OpenGL, #Godot</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
<i class="fa fa-2x fa-pause text-warning"></i>
|
<i class="fa fa-2x fa-pause text-warning"></i>
|
||||||
<i class="fa fa-2x fa-stop text-danger"></i>
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col fixs">
|
<div class="col fixs">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<img class="card-img-top" height="200" src="images/darkrpserver.png" alt="Card image cap">
|
||||||
Featured
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">DarkRP2D-Server</h5>
|
||||||
|
<p class="card-text text-light">Physic over network Box2d</p>
|
||||||
|
<p class="card-text text-light">#C++, #OpenGL, #Network</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-pause text-warning"></i>
|
||||||
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col fixs">
|
<div class="col fixs">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<img class="card-img-top" height="200" src="images/leaflet.png" alt="Card image cap">
|
||||||
Featured
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">Leaflet-3D Plugin</h5>
|
||||||
|
<p class="card-text text-light">Das Leaflet 3D-Plugin ermöglicht die perspektivisch korrekte Darstellung von
|
||||||
|
3D-Gebäuden auf einer Open Street Map Karte innerhalb von Leaflet. Zur performanten Darstellung der
|
||||||
|
3D-Gebäude wird eine Eigenimplementierung unter Einsatz von WebGL2 verwendet.</p>
|
||||||
|
<p class="card-text text-light">3D-Gebäude werden in Blender modelliert, können jedoch auch als Fallback
|
||||||
|
anhand des OSM Gebäude-Grundrisses generiert werden. Bei der 3D-Ansicht ist es möglich die Gebäude mit
|
||||||
|
unterschiedlichen Farben und Features darzustellen.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<a href="https://mocainfo.thm.de/building-3d/">Live-Demo</a>
|
||||||
|
<a href="https://git.rismer.de/gulum/leaflet3d"><i class="fa fa-2x fa-git-square float-right"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col fixs">
|
<div class="col fixs">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<img class="card-img-top" height="200" src="https://via.placeholder.com/400x200" alt="Card image cap">
|
||||||
Featured
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">C++-Ocean-FFT</h5>
|
||||||
|
<p class="card-text text-light"></p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-pause text-warning"></i>
|
||||||
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col fixs">
|
<div class="col fixs">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<img class="card-img-top" height="200" src="images/phong-shading.gif" alt="Card image cap">
|
||||||
Featured
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">Blinn-Phong-Shading Seminar</h5>
|
||||||
|
<p class="card-text text-light">Im Rahmen des Masterseminar meines Masterstudiums hatte ich mich mit Beleuchtungsmodellen (BRDF) beschäftigt. Hierzu gibt es eine Ausarbeitung sowie ein ausführbares Web-Version.</p>
|
||||||
|
<p class="card-text text-light">#JavaScript, #webGL, #CG</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<a href="blinn-phong">Live-Demo</a>
|
||||||
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
|
<i class="fa fa-2x fa-file-pdf-o float-right"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col fixs">
|
||||||
|
<div class="card">
|
||||||
|
<img class="card-img-top" height="200" src="https://via.placeholder.com/400x200" alt="Card image cap">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">Fraktale-Welt Seminar</h5>
|
||||||
|
<p class="card-text text-light"></p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
|
<i class="fa fa-2x fa-file-pdf-o float-right"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col fixs">
|
||||||
|
<div class="card">
|
||||||
|
<img class="card-img-top" height="200" src="https://via.placeholder.com/400x200" alt="Card image cap">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-light">Arcade-Shooter</h5>
|
||||||
|
<p class="card-text text-light">Hausarbeit aus dem 1-Semester</p>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<i class="fa fa-2x fa-check text-success"></i>
|
||||||
|
<i class="fa fa-2x fa-git-square float-right"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<footer class="page-footer font-small" style="background-color: #006494;">
|
||||||
|
</footer>
|
||||||
|
|
||||||
<!-- Optional JavaScript -->
|
<!-- Optional JavaScript -->
|
||||||
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
|
||||||
|
|||||||
Reference in New Issue
Block a user