projects
/
sixth-3d-demos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
680a14d
)
Added screenshot for lots of text editors
author
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Sat, 29 May 2021 02:04:15 +0000
(
05:04
+0300)
committer
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Sat, 29 May 2021 02:04:15 +0000
(
05:04
+0300)
doc/index.html
patch
|
blob
|
history
doc/index.org
patch
|
blob
|
history
doc/screenshots/text editors 2.png
[new file with mode: 0644]
patch
|
blob
src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
patch
|
blob
|
history
diff --git
a/doc/index.html
b/doc/index.html
index
a1dd806
..
f9207d8
100644
(file)
--- a/
doc/index.html
+++ b/
doc/index.html
@@
-3,7
+3,7
@@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<!-- 2021-05-29 Sat 0
2:3
1 -->
+<!-- 2021-05-29 Sat 0
5:0
1 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Sixth 3D engine demos</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Sixth 3D engine demos</title>
@@
-224,28
+224,28
@@
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
-<li><a href="#org
4f0e7fe
">1. General</a>
+<li><a href="#org
95d4b4a
">1. General</a>
<ul>
<ul>
-<li><a href="#org
a46b71e
">1.1. Source code</a></li>
+<li><a href="#org
b4bf858
">1.1. Source code</a></li>
</ul>
</li>
</ul>
</li>
-<li><a href="#org
ef4de6a
">2. Overview</a></li>
-<li><a href="#org
3f74fff
">3. Navigating in space</a></li>
-<li><a href="#org
3b10dd6
">4. Example scenes in this repository</a>
+<li><a href="#org
c815f60
">2. Overview</a></li>
+<li><a href="#org
8b7a7b2
">3. Navigating in space</a></li>
+<li><a href="#org
48ba3fe
">4. Example scenes in this repository</a>
<ul>
<ul>
-<li><a href="#org
6ce2160
">4.1. Raytracing through voxels</a></li>
-<li><a href="#org
4a93a2
5">4.2. Conway's Game of Life</a></li>
-<li><a href="#org
6ee86f3
">4.3. Text editors</a></li>
-<li><a href="#org
daa46bd
">4.4. Mathematical formulas</a></li>
-<li><a href="#org
a9bf86
e">4.5. Sinus heightmaps and sphere</a></li>
+<li><a href="#org
00b3f6a
">4.1. Raytracing through voxels</a></li>
+<li><a href="#org
c873cd
5">4.2. Conway's Game of Life</a></li>
+<li><a href="#org
45d4cba
">4.3. Text editors</a></li>
+<li><a href="#org
a981e88
">4.4. Mathematical formulas</a></li>
+<li><a href="#org
2f45be
e">4.5. Sinus heightmaps and sphere</a></li>
</ul>
</li>
</ul>
</div>
</div>
</ul>
</li>
</ul>
</div>
</div>
-<div id="outline-container-org
4f0e7fe
" class="outline-2">
-<h2 id="org
4f0e7fe
"><span class="section-number-2">1</span> General</h2>
+<div id="outline-container-org
95d4b4a
" class="outline-2">
+<h2 id="org
95d4b4a
"><span class="section-number-2">1</span> General</h2>
<div class="outline-text-2" id="text-1">
<ul class="org-ul">
<li>This program is free software: released under Creative Commons Zero
<div class="outline-text-2" id="text-1">
<ul class="org-ul">
<li>This program is free software: released under Creative Commons Zero
@@
-262,8
+262,8
@@
</ul>
</div>
</ul>
</div>
-<div id="outline-container-org
a46b71e
" class="outline-3">
-<h3 id="org
a46b71e
"><span class="section-number-3">1.1</span> Source code</h3>
+<div id="outline-container-org
b4bf858
" class="outline-3">
+<h3 id="org
b4bf858
"><span class="section-number-3">1.1</span> Source code</h3>
<div class="outline-text-3" id="text-1-1">
<ul class="org-ul">
<li><a href="https://www2.svjatoslav.eu/gitweb/?p=sixth-3d-demos.git;a=snapshot;h=HEAD;sf=tgz">Download latest snapshot in TAR GZ format</a></li>
<div class="outline-text-3" id="text-1-1">
<ul class="org-ul">
<li><a href="https://www2.svjatoslav.eu/gitweb/?p=sixth-3d-demos.git;a=snapshot;h=HEAD;sf=tgz">Download latest snapshot in TAR GZ format</a></li>
@@
-281,8
+281,8
@@
git clone https://www2.svjatoslav.eu/git/sixth-3d-demos.git
</div>
</div>
</div>
</div>
-<div id="outline-container-org
ef4de6a
" class="outline-2">
-<h2 id="org
ef4de6a
"><span class="section-number-2">2</span> Overview</h2>
+<div id="outline-container-org
c815f60
" class="outline-2">
+<h2 id="org
c815f60
"><span class="section-number-2">2</span> Overview</h2>
<div class="outline-text-2" id="text-2">
<p>
Goal of this project is to show off capabilities and API usage of
<div class="outline-text-2" id="text-2">
<p>
Goal of this project is to show off capabilities and API usage of
@@
-290,7
+290,7
@@
Goal of this project is to show off capabilities and API usage of
</p>
<p>
</p>
<p>
-All <a href="#org
3b10dd6
">example scenes in this repository</a> render at interactive
+All <a href="#org
48ba3fe
">example scenes in this repository</a> render at interactive
framerates.
</p>
framerates.
</p>
@@
-307,8
+307,8
@@
java -jar sixth-3d-demos.jar
</div>
</div>
</div>
</div>
-<div id="outline-container-org
3f74fff
" class="outline-2">
-<h2 id="org
3f74fff
"><span class="section-number-2">3</span> Navigating in space</h2>
+<div id="outline-container-org
8b7a7b2
" class="outline-2">
+<h2 id="org
8b7a7b2
"><span class="section-number-2">3</span> Navigating in space</h2>
<div class="outline-text-2" id="text-3">
<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
<div class="outline-text-2" id="text-3">
<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
@@
-344,15
+344,15
@@
java -jar sixth-3d-demos.jar
</div>
</div>
</div>
</div>
-<div id="outline-container-org
3b10dd6
" class="outline-2">
-<h2 id="org
3b10dd6
"><span class="section-number-2">4</span> Example scenes in this repository</h2>
+<div id="outline-container-org
48ba3fe
" class="outline-2">
+<h2 id="org
48ba3fe
"><span class="section-number-2">4</span> Example scenes in this repository</h2>
<div class="outline-text-2" id="text-4">
</div>
<div class="outline-text-2" id="text-4">
</div>
-<div id="outline-container-org
6ce2160
" class="outline-3">
-<h3 id="org
6ce2160
"><span class="section-number-3">4.1</span> Raytracing through voxels</h3>
+<div id="outline-container-org
00b3f6a
" class="outline-3">
+<h3 id="org
00b3f6a
"><span class="section-number-3">4.1</span> Raytracing through voxels</h3>
<div class="outline-text-3" id="text-4-1">
<div class="outline-text-3" id="text-4-1">
-<div id="org
c8737da
" class="figure">
+<div id="org
4c3989b
" class="figure">
<p><img src="screenshots/raytracing fractal in voxel polygon hybrid scene.png" alt="raytracing fractal in voxel polygon hybrid scene.png" />
</p>
</div>
<p><img src="screenshots/raytracing fractal in voxel polygon hybrid scene.png" alt="raytracing fractal in voxel polygon hybrid scene.png" />
</p>
</div>
@@
-380,8
+380,8
@@
datastructure.
</div>
</div>
</div>
</div>
-<div id="outline-container-org
4a93a2
5" class="outline-3">
-<h3 id="org
4a93a2
5"><span class="section-number-3">4.2</span> Conway's Game of Life</h3>
+<div id="outline-container-org
c873cd
5" class="outline-3">
+<h3 id="org
c873cd
5"><span class="section-number-3">4.2</span> Conway's Game of Life</h3>
<div class="outline-text-3" id="text-4-2">
<p>
The Game of Life, also known simply as Life, is a cellular automaton
<div class="outline-text-3" id="text-4-2">
<p>
The Game of Life, also known simply as Life, is a cellular automaton
@@
-403,7
+403,7
@@
otherwise it dies.</li>
</ul>
</ul>
-<div id="org0
78306e
" class="figure">
+<div id="org0
6856d1
" class="figure">
<p><img src="screenshots/life.png" alt="life.png" />
</p>
</div>
<p><img src="screenshots/life.png" alt="life.png" />
</p>
</div>
@@
-456,11
+456,11
@@
Usage:
</div>
</div>
</div>
</div>
-<div id="outline-container-org
6ee86f3
" class="outline-3">
-<h3 id="org
6ee86f3
"><span class="section-number-3">4.3</span> Text editors</h3>
+<div id="outline-container-org
45d4cba
" class="outline-3">
+<h3 id="org
45d4cba
"><span class="section-number-3">4.3</span> Text editors</h3>
<div class="outline-text-3" id="text-4-3">
<div class="outline-text-3" id="text-4-3">
-<div id="org
f87c091
" class="figure">
+<div id="org
d8ec036
" class="figure">
<p><img src="screenshots/text editors.png" alt="text editors.png" />
</p>
</div>
<p><img src="screenshots/text editors.png" alt="text editors.png" />
</p>
</div>
@@
-513,13
+513,23
@@
user is redirected also to proper location in the world.</li>
return to them.</li>
</ul></li>
</ul>
return to them.</li>
</ul></li>
</ul>
+
+<p>
+<b>Quite a lot of text editors can be rendered:</b>
+</p>
+
+
+<div id="orgc510a03" class="figure">
+<p><img src="screenshots/text editors 2.png" alt="text editors 2.png" />
+</p>
+</div>
</div>
</div>
</div>
</div>
-<div id="outline-container-org
daa46bd
" class="outline-3">
-<h3 id="org
daa46bd
"><span class="section-number-3">4.4</span> Mathematical formulas</h3>
+<div id="outline-container-org
a981e88
" class="outline-3">
+<h3 id="org
a981e88
"><span class="section-number-3">4.4</span> Mathematical formulas</h3>
<div class="outline-text-3" id="text-4-4">
<div class="outline-text-3" id="text-4-4">
-<div id="org
f582a24
" class="figure">
+<div id="org
67b5695
" class="figure">
<p><img src="screenshots/mathematical formulas.png" alt="mathematical formulas.png" />
</p>
</div>
<p><img src="screenshots/mathematical formulas.png" alt="mathematical formulas.png" />
</p>
</div>
@@
-530,11
+540,11
@@
visualize some formula using all 3 dimensions avaliable.</li>
</ul>
</div>
</div>
</ul>
</div>
</div>
-<div id="outline-container-org
a9bf86
e" class="outline-3">
-<h3 id="org
a9bf86
e"><span class="section-number-3">4.5</span> Sinus heightmaps and sphere</h3>
+<div id="outline-container-org
2f45be
e" class="outline-3">
+<h3 id="org
2f45be
e"><span class="section-number-3">4.5</span> Sinus heightmaps and sphere</h3>
<div class="outline-text-3" id="text-4-5">
<div class="outline-text-3" id="text-4-5">
-<div id="org
4fe1971
" class="figure">
+<div id="org
63e266a
" class="figure">
<p><img src="screenshots/sinus heightmaps and sphere.png" alt="sinus heightmaps and sphere.png" />
</p>
</div>
<p><img src="screenshots/sinus heightmaps and sphere.png" alt="sinus heightmaps and sphere.png" />
</p>
</div>
@@
-548,7
+558,7
@@
Simple test scene. Easy to implement and looks nice.
</div>
<div id="postamble" class="status">
<p class="author">Author: Svjatoslav Agejenko</p>
</div>
<div id="postamble" class="status">
<p class="author">Author: Svjatoslav Agejenko</p>
-<p class="date">Created: 2021-05-29 Sat 0
2:3
1</p>
+<p class="date">Created: 2021-05-29 Sat 0
5:0
1</p>
<p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
</div>
</body>
<p class="validation"><a href="https://validator.w3.org/check?uri=referer">Validate</a></p>
</div>
</body>
diff --git
a/doc/index.org
b/doc/index.org
index
3d21043
..
e3b0019
100644
(file)
--- a/
doc/index.org
+++ b/
doc/index.org
@@
-115,6
+115,10
@@
again, window must be unfocused first using ESC key.
user is redirected also to proper location in the world.
+ Possibility to store recently visited locations in the world and
return to them.
user is redirected also to proper location in the world.
+ Possibility to store recently visited locations in the world and
return to them.
+
+*Quite a lot of text editors can be rendered:*
+
+[[file:screenshots/text editors 2.png]]
** Mathematical formulas
[[file:screenshots/mathematical formulas.png]]
** Mathematical formulas
[[file:screenshots/mathematical formulas.png]]
diff --git a/doc/screenshots/text editors 2.png
b/doc/screenshots/text editors 2.png
new file mode 100644
(file)
index 0000000..
cb1733f
Binary files /dev/null and b/doc/screenshots/text editors 2.png differ
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
b/src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
index
1bcdfb3
..
a2a4669
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/examples/TextEditorDemo.java
@@
-12,6
+12,7
@@
import eu.svjatoslav.sixth.e3d.geometry.Rectangle;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
import eu.svjatoslav.sixth.e3d.gui.ViewFrame;
import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
import eu.svjatoslav.sixth.e3d.gui.ViewFrame;
import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
+import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.LookAndFeel;
import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.TextEditComponent;
import eu.svjatoslav.sixth.e3d.math.Transform;
import eu.svjatoslav.sixth.e3d.renderer.raster.Color;
import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.TextEditComponent;
import eu.svjatoslav.sixth.e3d.math.Transform;
import eu.svjatoslav.sixth.e3d.renderer.raster.Color;
@@
-54,7
+55,7
@@
public class TextEditorDemo {
final TextEditComponent textEditor = new TextEditComponent(
new Transform(new Point3D(x, 0, z)), viewPanel,
final TextEditComponent textEditor = new TextEditComponent(
new Transform(new Point3D(x, 0, z)), viewPanel,
- new Point2D(200, 120));
+ new Point2D(200, 120)
, new LookAndFeel()
);
shapeCollection.addShape(textEditor);
}
shapeCollection.addShape(textEditor);
}
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
b/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
index
0a60798
..
e620649
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
@@
-23,6
+23,7
@@
class MenuPanel extends JPanel {
sequentialGroup.addComponent(new JButton(new ShowPointCloud()));
sequentialGroup.addComponent(new JButton(new ShowRain()));
sequentialGroup.addComponent(new JButton(new ShowTextEditors()));
sequentialGroup.addComponent(new JButton(new ShowPointCloud()));
sequentialGroup.addComponent(new JButton(new ShowRain()));
sequentialGroup.addComponent(new JButton(new ShowTextEditors()));
+ sequentialGroup.addComponent(new JButton(new ShowTextEditors2()));
sequentialGroup.addComponent(new JButton(new ShowGameOfLife()));
sequentialGroup.addComponent(new JButton(new ShowRandomPolygons()));
}
sequentialGroup.addComponent(new JButton(new ShowGameOfLife()));
sequentialGroup.addComponent(new JButton(new ShowRandomPolygons()));
}
@@
-38,6
+39,17
@@
class MenuPanel extends JPanel {
}
}
}
}
+ private static class ShowTextEditors2 extends AbstractAction {
+ ShowTextEditors2() {
+ putValue(NAME, "Text editors city");
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent e) {
+ TextEditorDemo2.main(null);
+ }
+ }
+
private static class ShowRain extends AbstractAction {
ShowRain() {
private static class ShowRain extends AbstractAction {
ShowRain() {