Compare commits

...

10 Commits

Author SHA1 Message Date
Julian
edf69cbd6d Add lfs tracking and add some projects 2020-01-28 23:02:42 +01:00
Julian
8381cc1035 Add webocean demo 2020-01-27 16:56:52 +01:00
Julian
c8fe6b6dae Merge branch 'master' of git.rismer.de:website/projectpage 2020-01-26 22:51:51 +01:00
Julian
8ba874099b add cross-platform compatibility for backdropfilter and some more projects 2020-01-26 22:51:37 +01:00
Julian
6b211514d0 Update .gitlab-ci.yml 2020-01-26 22:32:36 +01:00
Julian
a2e3505c76 Update .gitlab-ci.yml 2020-01-26 22:31:49 +01:00
Julian
be37066adc Update .gitlab-ci.yml 2020-01-26 20:48:30 +01:00
Julian
07b7f21922 Update .gitlab-ci.yml 2020-01-26 20:45:32 +01:00
Julian
e244b5980d Add .gitlab-ci.yml 2020-01-26 20:34:17 +01:00
Julian
516b6ca450 Add legend, some project skeletons and preview images 2020-01-19 01:42:44 +01:00
11 changed files with 202 additions and 17 deletions

3
.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
*.gif filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text

15
.gitlab-ci.yml Normal file
View 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

View File

@@ -6,6 +6,17 @@ body {
.card {
background-color: #006494;
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 {
@@ -19,7 +30,7 @@ body {
background-repeat: no-repeat;
background-size: cover;
height: 500px;
overflow: hidden;
overflow: hidden;
padding-left: 0px;
padding-right: 0px;
}
@@ -33,6 +44,8 @@ body {
top:10%;
background-color: rgba(255, 255, 255, .15);
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);
-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);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 132 B

3
images/bsc.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5043c47bf8143fe1910fcbbef9e7aef2d9f4b036a16a94c21eabf503578824bd
size 121667

3
images/darkrp.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbdbb85e27407e053df5084673197c01d7e99d1d8006381c34393c37317c12e6
size 53365

3
images/darkrpserver.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d14f5da5ec7821adf3a24bf69a44bf4e9cd713e1d7a25611d19cdba1fd069e21
size 26280

3
images/leaflet.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ffe910e1888e730f2f6c30373773af16f3bbaef2fcb939c35b17e1f8dd8fb9f
size 149998

3
images/phong-shading.gif Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dc33c9e44f82a460f49b0d3e88f25564519a5f6aef6193cf7cbe7c49dc6a592
size 762073

3
images/webOcean.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd27e7cdc2f34ef1ea16c904455d90e4e5b70c71a3be54e920eb312467735ecd
size 42636

View File

@@ -14,62 +14,198 @@
<!-- OWN CSS -->
<link rel="stylesheet" type="text/css" href="css/style.css">
<title>Nothing to see here.</title>
<title>Projekte</title>
</head>
<body>
<div class="container-fluid position-relative header">
<div class="blurred"></div>
<h4 class="position-absolute font-italic" style="bottom:5px;right:25px;">TEST</h4>
<div class="blurred p-3">
<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 class="container-fluid p-2">
<div class="row row-cols-1 mx-auto">
<div class="col fixs">
<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">
<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>
<i class="fa fa-2x fa-git-square"></i>
<p class="card-text text-light">Ein Typescript-Port des C-Ocean Projekts aktuell beschränkt auf ein
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>
<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-stop text-danger"></i>
<i class="fa fa-2x fa-git-square float-right"></i>
</div>
</div>
</div>
<div class="col fixs">
<div class="card">
<div class="card-header">
Featured
<img class="card-img-top" height="200" src="images/darkrpserver.png" alt="Card image cap">
<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 class="col fixs">
<div class="card">
<div class="card-header">
Featured
<img class="card-img-top" height="200" src="images/leaflet.png" alt="Card image cap">
<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 class="col fixs">
<div class="card">
<div class="card-header">
Featured
<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">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 class="col fixs">
<div class="card">
<div class="card-header">
Featured
<img class="card-img-top" height="200" src="images/phong-shading.gif" alt="Card image cap">
<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>
<footer class="page-footer font-small" style="background-color: #006494;">
</footer>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->