forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 48a5ca8cd0 into b0a30eae5a

This commit is contained in:
Imperatorn 2024-03-20 13:47:21 +08:00 committed by GitHub
parent b0a30eae5a 48a5ca8cd0
commit 0fd0fa6d86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1110 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dub.json
View File

@ -34,8 +34,8 @@
"dependencies": { "dependencies": {
"inilike": "~>1.2.2", "inilike": "~>1.2.2",
"icontheme": "~>1.2.3", "icontheme": "~>1.2.3",
"arsd-official:dom": "~>11.1.0", "arsd-official:dom": "11.2.3",
"arsd-official:image_files": "~>11.1.0" "arsd-official:image_files": "11.2.3"
}, },
"subPackages": [ "subPackages": [

431
examples/dminer/src/minermain.d
View File

@ -40,12 +40,14 @@ import dminer.core.chunk;
mixin APP_ENTRY_POINT; mixin APP_ENTRY_POINT;
/// entry point for dlangui based application /// entry point for dlangui based application
extern (C) int UIAppMain(string[] args) { extern (C) int UIAppMain(string[] args)
{
// embed resources listed in views/resources.list into executable // embed resources listed in views/resources.list into executable
embeddedResourceList.addResources(embedResourcesFromList!("resources.list")()); embeddedResourceList.addResources(embedResourcesFromList!("resources.list")());
//embeddedResourceList.dumpEmbeddedResources(); //embeddedResourceList.dumpEmbeddedResources();
debug { debug
{
testPlanes(); testPlanes();
} }
@ -62,17 +64,22 @@ extern (C) int UIAppMain(string[] args) {
return Platform.instance.enterMessageLoop(); return Platform.instance.enterMessageLoop();
} }
class ChunkVisitCounter : ChunkVisitor { class ChunkVisitCounter : ChunkVisitor
{
int count; int count;
bool visit(World world, SmallChunk * chunk) { bool visit(World world, SmallChunk* chunk)
{
count++; count++;
return true; return true;
} }
} }
class MinerDrawable : MaterialDrawableObject, ChunkVisitor { class MinerDrawable : MaterialDrawableObject, ChunkVisitor
{
import dlangui.graphics.scene.node; import dlangui.graphics.scene.node;
import core.sys.linux.input_event_codes;
private World _world; private World _world;
private ChunkDiamondVisitor _chunkVisitor; private ChunkDiamondVisitor _chunkVisitor;
private VisibilityCheckIterator _chunkIterator; private VisibilityCheckIterator _chunkIterator;
@ -83,17 +90,27 @@ class MinerDrawable : MaterialDrawableObject, ChunkVisitor {
private vec3 _camForwardVector; private vec3 _camForwardVector;
private bool _wireframe; private bool _wireframe;
@property bool wireframe() { return _wireframe; } @property bool wireframe()
@property void wireframe(bool flgWireframe) { _wireframe = flgWireframe; } {
return _wireframe;
}
this(World world, Material material, Camera cam) { @property void wireframe(bool flgWireframe)
{
_wireframe = flgWireframe;
}
this(World world, Material material, Camera cam)
{
super(material); super(material);
_world = world; _world = world;
_cam = cam; _cam = cam;
} }
int _skippedCount; int _skippedCount;
int _drawnCount; int _drawnCount;
override void draw(Node3d node, bool wireframe) { override void draw(Node3d node, bool wireframe)
{
/// override it /// override it
_node = node; _node = node;
//Log.d("drawing Miner scene"); //Log.d("drawing Miner scene");
@ -109,7 +126,8 @@ class MinerDrawable : MaterialDrawableObject, ChunkVisitor {
camVector.x = cast(int)(_camForwardVector.x * 256); camVector.x = cast(int)(_camForwardVector.x * 256);
camVector.y = cast(int)(_camForwardVector.y * 256); camVector.y = cast(int)(_camForwardVector.y * 256);
camVector.z = cast(int)(_camForwardVector.z * 256); camVector.z = cast(int)(_camForwardVector.z * 256);
version (TEST_VISITOR_PERFORMANCE) { version (TEST_VISITOR_PERFORMANCE)
{
ChunkVisitCounter countVisitor = new ChunkVisitCounter(); ChunkVisitCounter countVisitor = new ChunkVisitCounter();
_chunkIterator.start(_world, _world.camPosition.pos, MAX_VIEW_DISTANCE); _chunkIterator.start(_world, _world.camPosition.pos, MAX_VIEW_DISTANCE);
_chunkIterator.visitVisibleChunks(countVisitor, camVector); _chunkIterator.visitVisibleChunks(countVisitor, camVector);
@ -118,15 +136,20 @@ class MinerDrawable : MaterialDrawableObject, ChunkVisitor {
_chunkIterator.visitVisibleChunks(this, camVector); _chunkIterator.visitVisibleChunks(this, camVector);
long duration = currentTimeMillis() - ts; long duration = currentTimeMillis() - ts;
Log.d("drawing of Miner scene finished in ", duration, " ms skipped:", _skippedCount, " drawn:", _drawnCount, " duration(noDraw)=", durationNoDraw); Log.d("drawing of Miner scene finished in ", duration, " ms skipped:", _skippedCount, " drawn:", _drawnCount, " duration(noDraw)=", durationNoDraw);
} else { }
else
{
_chunkIterator.start(_world, _world.camPosition.pos, MAX_VIEW_DISTANCE); _chunkIterator.start(_world, _world.camPosition.pos, MAX_VIEW_DISTANCE);
_chunkIterator.visitVisibleChunks(this, camVector); _chunkIterator.visitVisibleChunks(this, camVector);
long duration = currentTimeMillis() - ts; long duration = currentTimeMillis() - ts;
Log.d("drawing of Miner scene finished in ", duration, " ms skipped:", _skippedCount, " drawn:", _drawnCount); Log.d("drawing of Miner scene finished in ", duration, " ms skipped:", _skippedCount, " drawn:", _drawnCount);
} }
} }
bool visit(World world, SmallChunk * chunk) {
if (chunk) { bool visit(World world, SmallChunk* chunk)
{
if (chunk)
{
Vector3d p = chunk.position; Vector3d p = chunk.position;
vec3 chunkPos = vec3(p.x + 4, p.y + 4, p.z + 4); vec3 chunkPos = vec3(p.x + 4, p.y + 4, p.z + 4);
float camDist = (_camPosition - chunkPos).length; float camDist = (_camPosition - chunkPos).length;
@ -137,12 +160,14 @@ class MinerDrawable : MaterialDrawableObject, ChunkVisitor {
threshold = 0.2; threshold = 0.2;
//Log.d("visit() chunkPos ", chunkPos, " chunkDir ", chunkDirection, " camDir ", " dot ", dot, " threshold ", threshold); //Log.d("visit() chunkPos ", chunkPos, " chunkDir ", chunkDirection, " camDir ", " dot ", dot, " threshold ", threshold);
if (dot < threshold) { // cos(45) if (dot < threshold)
{ // cos(45)
_skippedCount++; _skippedCount++;
return false; return false;
} }
Mesh mesh = chunk.getMesh(world); Mesh mesh = chunk.getMesh(world);
if (mesh) { if (mesh)
{
_material.bind(_node, mesh, lights(_node)); _material.bind(_node, mesh, lights(_node));
_material.drawMesh(mesh, _wireframe); _material.drawMesh(mesh, _wireframe);
_material.unbind(); _material.unbind();
@ -154,13 +179,16 @@ class MinerDrawable : MaterialDrawableObject, ChunkVisitor {
} }
} }
class UiWidget : VerticalLayout { //, CellVisitor class UiWidget : VerticalLayout
this() { { //, CellVisitor
this()
{
super("OpenGLView"); super("OpenGLView");
layoutWidth = FILL_PARENT; layoutWidth = FILL_PARENT;
layoutHeight = FILL_PARENT; layoutHeight = FILL_PARENT;
alignment = Align.Center; alignment = Align.Center;
try { try
{
parseML(q{ parseML(q{
{ {
margins: 0 margins: 0
@ -182,7 +210,9 @@ class UiWidget : VerticalLayout { //, CellVisitor
} }
} }
}, "", this); }, "", this);
} catch (Exception e) { }
catch (Exception e)
{
Log.e("Failed to parse dml", e); Log.e("Failed to parse dml", e);
} }
// assign OpenGL drawable to child widget background // assign OpenGL drawable to child widget background
@ -195,14 +225,17 @@ class UiWidget : VerticalLayout { //, CellVisitor
_scene.activeCamera = _cam; _scene.activeCamera = _cam;
static if (true) { static if (true)
{
_scene.skyBox.setFaceTexture(SkyBox.Face.Right, "skybox_night_right1"); _scene.skyBox.setFaceTexture(SkyBox.Face.Right, "skybox_night_right1");
_scene.skyBox.setFaceTexture(SkyBox.Face.Left, "skybox_night_left2"); _scene.skyBox.setFaceTexture(SkyBox.Face.Left, "skybox_night_left2");
_scene.skyBox.setFaceTexture(SkyBox.Face.Top, "skybox_night_top3"); _scene.skyBox.setFaceTexture(SkyBox.Face.Top, "skybox_night_top3");
_scene.skyBox.setFaceTexture(SkyBox.Face.Bottom, "skybox_night_bottom4"); _scene.skyBox.setFaceTexture(SkyBox.Face.Bottom, "skybox_night_bottom4");
_scene.skyBox.setFaceTexture(SkyBox.Face.Front, "skybox_night_front5"); _scene.skyBox.setFaceTexture(SkyBox.Face.Front, "skybox_night_front5");
_scene.skyBox.setFaceTexture(SkyBox.Face.Back, "skybox_night_back6"); _scene.skyBox.setFaceTexture(SkyBox.Face.Back, "skybox_night_back6");
} else { }
else
{
_scene.skyBox.setFaceTexture(SkyBox.Face.Right, "debug_right"); _scene.skyBox.setFaceTexture(SkyBox.Face.Right, "debug_right");
_scene.skyBox.setFaceTexture(SkyBox.Face.Left, "debug_left"); _scene.skyBox.setFaceTexture(SkyBox.Face.Left, "debug_left");
_scene.skyBox.setFaceTexture(SkyBox.Face.Top, "debug_top"); _scene.skyBox.setFaceTexture(SkyBox.Face.Top, "debug_top");
@ -221,20 +254,20 @@ class UiWidget : VerticalLayout { //, CellVisitor
dirLightNode.light.enabled = true; dirLightNode.light.enabled = true;
_scene.addChild(dirLightNode); _scene.addChild(dirLightNode);
int x0 = 0; int x0 = 0;
int y0 = 0; int y0 = 0;
int z0 = 0; int z0 = 0;
_minerMesh = new Mesh(VertexFormat(VertexElementType.POSITION, VertexElementType.NORMAL, VertexElementType
_minerMesh = new Mesh(VertexFormat(VertexElementType.POSITION, VertexElementType.NORMAL, VertexElementType.COLOR, VertexElementType.TEXCOORD0)); .COLOR, VertexElementType.TEXCOORD0));
_world = new World(); _world = new World();
initWorldTerrain(_world); initWorldTerrain(_world);
int cy0 = 3; int cy0 = 3;
for (int y = CHUNK_DY - 1; y > 0; y--) for (int y = CHUNK_DY - 1; y > 0; y--)
if (!_world.canPass(Vector3d(0, y, 0))) { if (!_world.canPass(Vector3d(0, y, 0)))
{
cy0 = y; cy0 = y;
break; break;
} }
@ -245,7 +278,6 @@ class UiWidget : VerticalLayout { //, CellVisitor
_world.setCell(5, cy0 + 5, -7, BlockId.face_test); _world.setCell(5, cy0 + 5, -7, BlockId.face_test);
_world.setCell(3, cy0 + 5, 13, BlockId.face_test); _world.setCell(3, cy0 + 5, 13, BlockId.face_test);
//_world.makeCastleWall(Vector3d(25, cy0 - 5, 12), Vector3d(1, 0, 0), 12, 30, 4, BlockId.brick); //_world.makeCastleWall(Vector3d(25, cy0 - 5, 12), Vector3d(1, 0, 0), 12, 30, 4, BlockId.brick);
_world.makeCastle(Vector3d(0, cy0, 60), 30, 12); _world.makeCastle(Vector3d(0, cy0, 60), 30, 12);
@ -254,7 +286,7 @@ class UiWidget : VerticalLayout { //, CellVisitor
Material minerMaterial = new Material(EffectId("textured.vert", "textured.frag", null), "blocks"); Material minerMaterial = new Material(EffectId("textured.vert", "textured.frag", null), "blocks");
//Material minerMaterial = new Material(EffectId("colored.vert", "colored.frag", null), "blocks"); //Material minerMaterial = new Material(EffectId("colored.vert", "colored.frag", null), "blocks");
minerMaterial.ambientColor = vec3(0.25,0.25,0.25); minerMaterial.ambientColor = vec3(0.25, 0.25, 0.25);
minerMaterial.textureLinear = false; minerMaterial.textureLinear = false;
minerMaterial.fogParams = new FogParams(vec4(0.01, 0.01, 0.01, 1), 12, 80); minerMaterial.fogParams = new FogParams(vec4(0.01, 0.01, 0.01, 1), 12, 80);
//minerMaterial.specular = 10; //minerMaterial.specular = 10;
@ -265,7 +297,6 @@ class UiWidget : VerticalLayout { //, CellVisitor
//_minerDrawable.wireframe = true; //_minerDrawable.wireframe = true;
_scene.addChild(minerNode); _scene.addChild(minerNode);
focusable = true; focusable = true;
} }
@ -274,11 +305,14 @@ class UiWidget : VerticalLayout { //, CellVisitor
int lastMouseX; int lastMouseX;
int lastMouseY; int lastMouseY;
/// process key event, return true if event is processed. /// process key event, return true if event is processed.
override bool onMouseEvent(MouseEvent event) { override bool onMouseEvent(MouseEvent event)
if (event.action == MouseAction.ButtonDown) { {
if (event.action == MouseAction.ButtonDown && false)
{
lastMouseX = event.x; lastMouseX = event.x;
lastMouseY = event.y; lastMouseY = event.y;
if (event.button == MouseButton.Left && false) { if (event.button == MouseButton.Left)
{
int x = event.x; int x = event.x;
int y = event.y; int y = event.y;
int xindex = 0; int xindex = 0;
@ -298,43 +332,47 @@ class UiWidget : VerticalLayout { //, CellVisitor
3 4 5 3 4 5
6 7 8 6 7 8
*/ */
switch(index) { switch (index)
default: {
case 1: default:
case 4: case 1:
//_world.camPosition.forward(1); case 4:
//updateCamPosition(); //_world.camPosition.forward(1);
startMoveAnimation(_world.camPosition.direction.forward); //updateCamPosition();
break; startMoveAnimation(_world.camPosition.direction.forward);
case 0: break;
case 3: case 0:
_world.camPosition.turnLeft(); case 3:
updateCamPosition(); _world.camPosition.turnLeft();
break; updateCamPosition();
case 2: break;
case 5: case 2:
_world.camPosition.turnRight(); case 5:
updateCamPosition(); _world.camPosition.turnRight();
break; updateCamPosition();
case 7: break;
//_world.camPosition.backward(1); case 7:
//updateCamPosition(); //_world.camPosition.backward(1);
startMoveAnimation(-_world.camPosition.direction.forward); //updateCamPosition();
break; startMoveAnimation(-_world.camPosition.direction.forward);
case 6: break;
//_world.camPosition.moveLeft(); case 6:
//updateCamPosition(); //_world.camPosition.moveLeft();
startMoveAnimation(_world.camPosition.direction.left); //updateCamPosition();
break; startMoveAnimation(_world.camPosition.direction.left);
case 8: break;
//_world.camPosition.moveRight(); case 8:
//updateCamPosition(); //_world.camPosition.moveRight();
startMoveAnimation(_world.camPosition.direction.right); //updateCamPosition();
break; startMoveAnimation(_world.camPosition.direction.right);
break;
} }
} }
} else if (event.action == MouseAction.Move) { }
if (event.lbutton.isDown) { else if (event.action == MouseAction.Move)
{
if (event.lbutton.isDown)
{
int deltaX = event.x - lastMouseX; int deltaX = event.x - lastMouseX;
int deltaY = event.y - lastMouseY; int deltaY = event.y - lastMouseY;
int maxshift = width > 100 ? width : 100; int maxshift = width > 100 ? width : 100;
@ -355,69 +393,82 @@ class UiWidget : VerticalLayout { //, CellVisitor
newAngleY = 65; newAngleY = 65;
setYAngle(newAngleY, true); setYAngle(newAngleY, true);
} }
} else if (event.action == MouseAction.ButtonUp || event.action == MouseAction.Cancel) { }
else if (event.action == MouseAction.ButtonUp || event.action == MouseAction.Cancel)
{
stopMoveAnimation(); stopMoveAnimation();
} }
return true; return true;
} }
/// process key event, return true if event is processed. /// process key event, return true if event is processed.
override bool onKeyEvent(KeyEvent event) { override bool onKeyEvent(KeyEvent event)
if (event.action == KeyAction.KeyDown) { {
switch(event.keyCode) with(KeyCode) { if (event.action == KeyAction.KeyDown)
case F1: {
_minerDrawable.wireframe = !_minerDrawable.wireframe; switch (event.keyCode) with (KeyCode)
return true; {
case KEY_W: case F1:
case UP: _minerDrawable.wireframe = !_minerDrawable.wireframe;
_world.camPosition.forward(1); return true;
updateCamPosition(); case KEY_W:
return true; case UP:
case DOWN: _world.camPosition.forward(1);
case KEY_S: updateCamPosition();
_world.camPosition.backward(1); return true;
updateCamPosition(); case DOWN:
return true; case KEY_S:
case KEY_A: _world.camPosition.backward(1);
case LEFT: updateCamPosition();
_world.camPosition.turnLeft(); return true;
updateCamPosition(); case KEY_A:
return true; case LEFT:
case KEY_D: _world.camPosition.turnLeft();
case RIGHT: updateCamPosition();
_world.camPosition.turnRight(); return true;
updateCamPosition(); case KEY_D:
return true; case RIGHT:
case HOME: _world.camPosition.turnRight();
case KEY_E: updateCamPosition();
_world.camPosition.moveUp(); return true;
updateCamPosition(); case HOME:
return true; case KEY_E:
case END: _world.camPosition.moveUp();
case KEY_Q: updateCamPosition();
_world.camPosition.moveDown(); return true;
updateCamPosition(); case END:
return true; case KEY_Q:
case KEY_Z: _world.camPosition.moveDown();
_world.camPosition.moveLeft(); updateCamPosition();
updateCamPosition(); return true;
return true; case KEY_Z:
case KEY_C: _world.camPosition.moveLeft();
_world.camPosition.moveRight(); updateCamPosition();
updateCamPosition(); return true;
return true; case KEY_C:
case KEY_F: _world.camPosition.moveRight();
flying = !flying; updateCamPosition();
if (!flying) return true;
_world.camPosition.pos.y = CHUNK_DY - 3; case KEY_F:
updateCamPosition(); flying = !flying;
return true; if (!flying)
case KEY_U: _world.camPosition.pos.y = CHUNK_DY - 3;
enableMeshUpdate = !enableMeshUpdate; updateCamPosition();
updateCamPosition(); return true;
return true; case KEY_U:
default: enableMeshUpdate = !enableMeshUpdate;
return false; updateCamPosition();
return true;
case KEY_PERIOD:
int cx = _world.camPosition.pos.x;
int cy = _world.camPosition.pos.y;
int cz = _world.camPosition.pos.z;
_world.setCell(cx+1, cy, cz+1, BlockId.clay);
return true;
default:
return false;
} }
} }
return false; return false;
@ -434,28 +485,34 @@ class UiWidget : VerticalLayout { //, CellVisitor
bool enableMeshUpdate = true; bool enableMeshUpdate = true;
Vector3d _moveAnimationDirection; Vector3d _moveAnimationDirection;
void animateMoving() { void animateMoving()
if (_moveAnimationDirection != Vector3d(0,0,0)) { {
if (_moveAnimationDirection != Vector3d(0, 0, 0))
{
Vector3d animPos = _world.camPosition.pos + _moveAnimationDirection; Vector3d animPos = _world.camPosition.pos + _moveAnimationDirection;
vec3 p = vec3(animPos.x + 0.5f, animPos.y + 0.5f, animPos.z + 0.5f); vec3 p = vec3(animPos.x + 0.5f, animPos.y + 0.5f, animPos.z + 0.5f);
if ((_animatingPosition - p).length < 2) { if ((_animatingPosition - p).length < 2)
{
_world.camPosition.pos += _moveAnimationDirection; _world.camPosition.pos += _moveAnimationDirection;
updateCamPosition(true); updateCamPosition(true);
} }
} }
} }
void updateCamPosition(bool animateIt = true) { void updateCamPosition(bool animateIt = true)
{
import std.string; import std.string;
import std.conv : to; import std.conv : to;
import std.utf : toUTF32; import std.utf : toUTF32;
import std.format; import std.format;
if (!flying) { if (!flying)
{
animateMoving(); animateMoving();
while(_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0))) while (_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0)))
_world.camPosition.pos += Vector3d(0, -1, 0); _world.camPosition.pos += Vector3d(0, -1, 0);
if(!_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0))) { if (!_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0)))
{
if (_world.canPass(_world.camPosition.pos + Vector3d(0, 1, 0))) if (_world.canPass(_world.camPosition.pos + Vector3d(0, 1, 0)))
_world.camPosition.pos += Vector3d(0, 1, 0); _world.camPosition.pos += Vector3d(0, 1, 0);
else if (_world.canPass(_world.camPosition.pos + Vector3d(1, 0, 0))) else if (_world.canPass(_world.camPosition.pos + Vector3d(1, 0, 0)))
@ -466,7 +523,7 @@ class UiWidget : VerticalLayout { //, CellVisitor
_world.camPosition.pos += Vector3d(0, 0, 1); _world.camPosition.pos += Vector3d(0, 0, 1);
else if (_world.canPass(_world.camPosition.pos + Vector3d(0, 0, -1))) else if (_world.canPass(_world.camPosition.pos + Vector3d(0, 0, -1)))
_world.camPosition.pos += Vector3d(0, 0, -1); _world.camPosition.pos += Vector3d(0, 0, -1);
while(_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0))) while (_world.canPass(_world.camPosition.pos + Vector3d(0, -1, 0)))
_world.camPosition.pos += Vector3d(0, -1, 0); _world.camPosition.pos += Vector3d(0, -1, 0);
} }
} }
@ -477,28 +534,33 @@ class UiWidget : VerticalLayout { //, CellVisitor
updatePositionMessage(); updatePositionMessage();
} }
void updatePositionMessage() { void updatePositionMessage()
{
import std.string : format; import std.string : format;
Widget w = childById("lblPosition"); Widget w = childById("lblPosition");
string dir = _world.camPosition.direction.dir.to!string; string dir = _world.camPosition.direction.dir.to!string;
dstring s = format("pos(%d,%d) h=%d fps:%d %s [F]lying: %s [U]pdateMesh: %s [F1] wireframe: %s", _world.camPosition.pos.x, _world.camPosition.pos.z, _world.camPosition.pos.y, dstring s = format("pos(%d,%d) h=%d fps:%d %s [F]lying: %s [U]pdateMesh: %s [F1] wireframe: %s", _world.camPosition.pos.x, _world
_fps, .camPosition.pos.z, _world.camPosition.pos.y,
dir, _fps,
flying, dir,
enableMeshUpdate, flying,
_minerDrawable ? _minerDrawable.wireframe : false enableMeshUpdate,
).toUTF32; _minerDrawable ? _minerDrawable.wireframe : false
).toUTF32;
w.text = s; w.text = s;
} }
int _fps = 0; int _fps = 0;
void startMoveAnimation(Vector3d direction) { void startMoveAnimation(Vector3d direction)
{
_moveAnimationDirection = direction; _moveAnimationDirection = direction;
updateCamPosition(); updateCamPosition();
} }
void stopMoveAnimation() { void stopMoveAnimation()
{
_moveAnimationDirection = Vector3d(0, 0, 0); _moveAnimationDirection = Vector3d(0, 0, 0);
updateCamPosition(); updateCamPosition();
} }
@ -524,91 +586,121 @@ class UiWidget : VerticalLayout { //, CellVisitor
float _animatingAngle; float _animatingAngle;
float _animatingYAngle; float _animatingYAngle;
void setPos(vec3 newPos, bool animateIt = false) { void setPos(vec3 newPos, bool animateIt = false)
if (animateIt) { {
if (animateIt)
{
_position = newPos; _position = newPos;
} else { }
else
{
_animatingPosition = newPos; _animatingPosition = newPos;
_position = newPos; _position = newPos;
} }
} }
void setAngle(float newAngle, bool animateIt = false) { void setAngle(float newAngle, bool animateIt = false)
if (animateIt) { {
if (animateIt)
{
_angle = newAngle; _angle = newAngle;
} else { }
else
{
_animatingAngle = newAngle; _animatingAngle = newAngle;
_angle = newAngle; _angle = newAngle;
} }
} }
void setYAngle(float newAngle, bool animateIt = false) { void setYAngle(float newAngle, bool animateIt = false)
if (animateIt) { {
if (animateIt)
{
_yAngle = newAngle; _yAngle = newAngle;
} else { }
else
{
_animatingYAngle = newAngle; _animatingYAngle = newAngle;
_yAngle = newAngle; _yAngle = newAngle;
} }
} }
/// returns true is widget is being animated - need to call animate() and redraw /// returns true is widget is being animated - need to call animate() and redraw
@property override bool animating() { return true; } @property override bool animating()
{
return true;
}
/// animates window; interval is time left from previous draw, in hnsecs (1/10000000 of second) /// animates window; interval is time left from previous draw, in hnsecs (1/10000000 of second)
override void animate(long interval) { override void animate(long interval)
{
//Log.d("animating"); //Log.d("animating");
if (interval > 0) { if (interval > 0)
{
int newfps = cast(int)(10000000.0 / interval); int newfps = cast(int)(10000000.0 / interval);
if (newfps < _fps - 3 || newfps > _fps + 3) { if (newfps < _fps - 3 || newfps > _fps + 3)
{
_fps = newfps; _fps = newfps;
updatePositionMessage(); updatePositionMessage();
} }
} }
animateMoving(); animateMoving();
if (_animatingAngle != _angle) { if (_animatingAngle != _angle)
{
float delta = _angle - _animatingAngle; float delta = _angle - _animatingAngle;
if (delta > 180) if (delta > 180)
delta -= 360; delta -= 360;
else if (delta < -180) else if (delta < -180)
delta += 360; delta += 360;
float dist = delta < 0 ? -delta : delta; float dist = delta < 0 ? -delta : delta;
if (dist < 5) { if (dist < 5)
{
_animatingAngle = _angle; _animatingAngle = _angle;
} else { }
else
{
float speed = 360 / 2; float speed = 360 / 2;
float step = speed * interval / 10000000.0f; float step = speed * interval / 10000000.0f;
//Log.d("Rotate animation delta=", delta, " dist=", dist, " elapsed=", interval, " step=", step); //Log.d("Rotate animation delta=", delta, " dist=", dist, " elapsed=", interval, " step=", step);
if (step > dist) if (step > dist)
step = dist; step = dist;
delta = delta * (step /dist); delta = delta * (step / dist);
_animatingAngle += delta; _animatingAngle += delta;
} }
} }
if (_animatingYAngle != _yAngle) { if (_animatingYAngle != _yAngle)
{
float delta = _yAngle - _animatingYAngle; float delta = _yAngle - _animatingYAngle;
if (delta > 180) if (delta > 180)
delta -= 360; delta -= 360;
else if (delta < -180) else if (delta < -180)
delta += 360; delta += 360;
float dist = delta < 0 ? -delta : delta; float dist = delta < 0 ? -delta : delta;
if (dist < 5) { if (dist < 5)
{
_animatingYAngle = _yAngle; _animatingYAngle = _yAngle;
} else { }
else
{
float speed = 360 / 2; float speed = 360 / 2;
float step = speed * interval / 10000000.0f; float step = speed * interval / 10000000.0f;
//Log.d("Rotate animation delta=", delta, " dist=", dist, " elapsed=", interval, " step=", step); //Log.d("Rotate animation delta=", delta, " dist=", dist, " elapsed=", interval, " step=", step);
if (step > dist) if (step > dist)
step = dist; step = dist;
delta = delta * (step /dist); delta = delta * (step / dist);
_animatingYAngle += delta; _animatingYAngle += delta;
} }
} }
if (_animatingPosition != _position) { if (_animatingPosition != _position)
{
vec3 delta = _position - _animatingPosition; vec3 delta = _position - _animatingPosition;
float dist = delta.length; float dist = delta.length;
if (dist < 0.01) { if (dist < 0.01)
{
_animatingPosition = _position; _animatingPosition = _position;
// done // done
} else { }
else
{
float speed = 8; float speed = 8;
if (dist > 2) if (dist > 2)
speed = (dist - 2) * 3 + speed; speed = (dist - 2) * 3 + speed;
@ -622,22 +714,22 @@ class UiWidget : VerticalLayout { //, CellVisitor
} }
invalidate(); invalidate();
} }
float angle = 0; float angle = 0;
Scene3d _scene; Scene3d _scene;
Camera _cam; Camera _cam;
Mesh _minerMesh; Mesh _minerMesh;
/// this is OpenGLDrawableDelegate implementation /// this is OpenGLDrawableDelegate implementation
private void doDraw(Rect windowRect, Rect rc) { private void doDraw(Rect windowRect, Rect rc)
{
_cam.setPerspective(rc.width, rc.height, 45.0f, 0.3, MAX_VIEW_DISTANCE); _cam.setPerspective(rc.width, rc.height, 45.0f, 0.3, MAX_VIEW_DISTANCE);
_cam.setIdentity(); _cam.setIdentity();
_cam.translate(_animatingPosition); _cam.translate(_animatingPosition);
_cam.rotateY(_animatingAngle); _cam.rotateY(_animatingAngle);
_cam.rotateX(_yAngle); _cam.rotateX(_yAngle);
dirLightNode.setIdentity(); dirLightNode.setIdentity();
dirLightNode.translate(_animatingPosition); dirLightNode.translate(_animatingPosition);
dirLightNode.rotateY(_animatingAngle); dirLightNode.rotateY(_animatingAngle);
@ -655,7 +747,8 @@ class UiWidget : VerticalLayout { //, CellVisitor
checkgl!glDisable(GL_CULL_FACE); checkgl!glDisable(GL_CULL_FACE);
} }
~this() { ~this()
{
destroy(_scene); destroy(_scene);
destroy(_world); destroy(_world);
} }

408
examples/dmledit/src/dmledit.d
View File

@ -8,13 +8,15 @@ import dlangui.widgets.metadata;
import std.array : replaceFirst; import std.array : replaceFirst;
import std.algorithm; import std.algorithm;
import std.stdio; import std.stdio;
import std.string;
import std.array; import std.array;
import std.file; import std.file;
mixin APP_ENTRY_POINT; mixin APP_ENTRY_POINT;
// action codes // action codes
enum IDEActions : int { enum IDEActions : int
{
//ProjectOpen = 1010000, //ProjectOpen = 1010000,
FileNew = 1010000, FileNew = 1010000,
FileOpen, FileOpen,
@ -29,27 +31,47 @@ enum IDEActions : int {
} }
// actions // actions
const Action ACTION_FILE_NEW = new Action(IDEActions.FileNew, "MENU_FILE_NEW"c, "document-new", KeyCode.KEY_N, KeyFlag.Control); const Action ACTION_FILE_NEW = new Action(IDEActions.FileNew, "MENU_FILE_NEW"c, "document-new", KeyCode.KEY_N, KeyFlag
const Action ACTION_FILE_SAVE = (new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control)).disableByDefault(); .Control);
const Action ACTION_FILE_SAVE_AS = (new Action(IDEActions.FileSaveAs, "MENU_FILE_SAVE_AS"c)).disableByDefault(); const Action ACTION_FILE_SAVE = (new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag
const Action ACTION_FILE_OPEN = new Action(IDEActions.FileOpen, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag.Control); .Control)).disableByDefault();
const Action ACTION_FILE_EXIT = new Action(IDEActions.FileExit, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag.Alt); const Action ACTION_FILE_SAVE_AS = (new Action(IDEActions.FileSaveAs, "MENU_FILE_SAVE_AS"c))
const Action ACTION_EDIT_COPY = (new Action(EditorActions.Copy, "MENU_EDIT_COPY"c, "edit-copy"c, KeyCode.KEY_C, KeyFlag.Control)).addAccelerator(KeyCode.INS, KeyFlag.Control).disableByDefault(); .disableByDefault();
const Action ACTION_EDIT_PASTE = (new Action(EditorActions.Paste, "MENU_EDIT_PASTE"c, "edit-paste"c, KeyCode.KEY_V, KeyFlag.Control)).addAccelerator(KeyCode.INS, KeyFlag.Shift).disableByDefault(); const Action ACTION_FILE_OPEN = new Action(IDEActions.FileOpen, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag
const Action ACTION_EDIT_CUT = (new Action(EditorActions.Cut, "MENU_EDIT_CUT"c, "edit-cut"c, KeyCode.KEY_X, KeyFlag.Control)).addAccelerator(KeyCode.DEL, KeyFlag.Shift).disableByDefault(); .Control);
const Action ACTION_EDIT_UNDO = (new Action(EditorActions.Undo, "MENU_EDIT_UNDO"c, "edit-undo"c, KeyCode.KEY_Z, KeyFlag.Control)).disableByDefault(); const Action ACTION_FILE_EXIT = new Action(IDEActions.FileExit, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag
const Action ACTION_EDIT_REDO = (new Action(EditorActions.Redo, "MENU_EDIT_REDO"c, "edit-redo"c, KeyCode.KEY_Y, KeyFlag.Control)).addAccelerator(KeyCode.KEY_Z, KeyFlag.Control|KeyFlag.Shift).disableByDefault(); .Alt);
const Action ACTION_EDIT_INDENT = (new Action(EditorActions.Indent, "MENU_EDIT_INDENT"c, "edit-indent"c, KeyCode.TAB, 0)).addAccelerator(KeyCode.KEY_BRACKETCLOSE, KeyFlag.Control).disableByDefault(); const Action ACTION_EDIT_COPY = (new Action(EditorActions.Copy, "MENU_EDIT_COPY"c, "edit-copy"c, KeyCode.KEY_C, KeyFlag
const Action ACTION_EDIT_UNINDENT = (new Action(EditorActions.Unindent, "MENU_EDIT_UNINDENT"c, "edit-unindent", KeyCode.TAB, KeyFlag.Shift)).addAccelerator(KeyCode.KEY_BRACKETOPEN, KeyFlag.Control).disableByDefault(); .Control)).addAccelerator(KeyCode.INS, KeyFlag.Control).disableByDefault();
const Action ACTION_EDIT_TOGGLE_LINE_COMMENT = (new Action(EditorActions.ToggleLineComment, "MENU_EDIT_TOGGLE_LINE_COMMENT"c, null, KeyCode.KEY_DIVIDE, KeyFlag.Control)).disableByDefault(); const Action ACTION_EDIT_PASTE = (new Action(EditorActions.Paste, "MENU_EDIT_PASTE"c, "edit-paste"c, KeyCode.KEY_V, KeyFlag
const Action ACTION_EDIT_TOGGLE_BLOCK_COMMENT = (new Action(EditorActions.ToggleBlockComment, "MENU_EDIT_TOGGLE_BLOCK_COMMENT"c, null, KeyCode.KEY_DIVIDE, KeyFlag.Control|KeyFlag.Shift)).disableByDefault(); .Control)).addAccelerator(KeyCode.INS, KeyFlag.Shift).disableByDefault();
const Action ACTION_EDIT_PREFERENCES = (new Action(IDEActions.EditPreferences, "MENU_EDIT_PREFERENCES"c, null)).disableByDefault(); const Action ACTION_EDIT_CUT = (new Action(EditorActions.Cut, "MENU_EDIT_CUT"c, "edit-cut"c, KeyCode.KEY_X, KeyFlag
const Action ACTION_DEBUG_START = new Action(IDEActions.DebugStart, "MENU_DEBUG_UPDATE_PREVIEW"c, "debug-run"c, KeyCode.F5, 0); .Control)).addAccelerator(KeyCode.DEL, KeyFlag.Shift).disableByDefault();
const Action ACTION_EDIT_UNDO = (new Action(EditorActions.Undo, "MENU_EDIT_UNDO"c, "edit-undo"c, KeyCode.KEY_Z, KeyFlag
.Control)).disableByDefault();
const Action ACTION_EDIT_REDO = (new Action(EditorActions.Redo, "MENU_EDIT_REDO"c, "edit-redo"c, KeyCode.KEY_Y, KeyFlag
.Control)).addAccelerator(KeyCode.KEY_Z, KeyFlag.Control | KeyFlag.Shift)
.disableByDefault();
const Action ACTION_EDIT_INDENT = (new Action(EditorActions.Indent, "MENU_EDIT_INDENT"c, "edit-indent"c, KeyCode.TAB, 0))
.addAccelerator(KeyCode.KEY_BRACKETCLOSE, KeyFlag.Control).disableByDefault();
const Action ACTION_EDIT_UNINDENT = (new Action(EditorActions.Unindent, "MENU_EDIT_UNINDENT"c, "edit-unindent", KeyCode
.TAB, KeyFlag.Shift)).addAccelerator(KeyCode.KEY_BRACKETOPEN, KeyFlag.Control)
.disableByDefault();
const Action ACTION_EDIT_TOGGLE_LINE_COMMENT = (new Action(EditorActions.ToggleLineComment, "MENU_EDIT_TOGGLE_LINE_COMMENT"c, null, KeyCode
.KEY_DIVIDE, KeyFlag.Control)).disableByDefault();
const Action ACTION_EDIT_TOGGLE_BLOCK_COMMENT = (new Action(EditorActions.ToggleBlockComment, "MENU_EDIT_TOGGLE_BLOCK_COMMENT"c, null, KeyCode
.KEY_DIVIDE, KeyFlag.Control | KeyFlag.Shift)).disableByDefault();
const Action ACTION_EDIT_PREFERENCES = (new Action(IDEActions.EditPreferences, "MENU_EDIT_PREFERENCES"c, null))
.disableByDefault();
const Action ACTION_DEBUG_START = new Action(IDEActions.DebugStart, "MENU_DEBUG_UPDATE_PREVIEW"c, "debug-run"c, KeyCode
.F5, 0);
const Action ACTION_HELP_ABOUT = new Action(IDEActions.HelpAbout, "MENU_HELP_ABOUT"c); const Action ACTION_HELP_ABOUT = new Action(IDEActions.HelpAbout, "MENU_HELP_ABOUT"c);
/// DIDE source file editor /// DIDE source file editor
class DMLSourceEdit : SourceEdit { class DMLSourceEdit : SourceEdit
this(string ID) { {
this(string ID)
{
super(ID); super(ID);
MenuItem editPopupItem = new MenuItem(null); MenuItem editPopupItem = new MenuItem(null);
editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_DEBUG_START); editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_DEBUG_START);
@ -57,21 +79,23 @@ class DMLSourceEdit : SourceEdit {
content.syntaxSupport = new DMLSyntaxSupport(""); content.syntaxSupport = new DMLSyntaxSupport("");
setTokenHightlightColor(TokenCategory.Comment, 0x008000); // green setTokenHightlightColor(TokenCategory.Comment, 0x008000); // green
setTokenHightlightColor(TokenCategory.Keyword, 0x0000FF); // blue setTokenHightlightColor(TokenCategory.Keyword, 0x0000FF); // blue
setTokenHightlightColor(TokenCategory.String, 0xa31515); // brown setTokenHightlightColor(TokenCategory.String, 0xa31515); // brown
setTokenHightlightColor(TokenCategory.Integer, 0xa315C0); // setTokenHightlightColor(TokenCategory.Integer, 0xa315C0); //
setTokenHightlightColor(TokenCategory.Float, 0xa315C0); // setTokenHightlightColor(TokenCategory.Float, 0xa315C0); //
setTokenHightlightColor(TokenCategory.Error, 0xFF0000); // red setTokenHightlightColor(TokenCategory.Error, 0xFF0000); // red
setTokenHightlightColor(TokenCategory.Op, 0x503000); setTokenHightlightColor(TokenCategory.Op, 0x503000);
setTokenHightlightColor(TokenCategory.Identifier_Class, 0x000080); // blue setTokenHightlightColor(TokenCategory.Identifier_Class, 0x000080); // blue
} }
this() {
this()
{
this("DMLEDIT"); this("DMLEDIT");
} }
} }
immutable dstring SAMPLE_SOURCE_CODE = immutable dstring SAMPLE_SOURCE_CODE =
q{VerticalLayout { q{VerticalLayout {
id: vlayout id: vlayout
margins: Rect { left: 5; right: 3; top: 2; bottom: 4 } margins: Rect { left: 5; right: 3; top: 2; bottom: 4 }
padding: Rect { 5, 4, 3, 2 } // same as Rect { left: 5; top: 4; right: 3; bottom: 2 } padding: Rect { 5, 4, 3, 2 } // same as Rect { left: 5; top: 4; right: 3; bottom: 2 }
@ -99,27 +123,30 @@ q{VerticalLayout {
// used to generate property lists once, then simply swap // used to generate property lists once, then simply swap
StringListAdapter[string] propListsAdapters; StringListAdapter[string] propListsAdapters;
class EditFrame : AppFrame { class EditFrame : AppFrame
{
MenuItem mainMenuItems; MenuItem mainMenuItems;
override protected void initialize() { override protected void initialize()
{
_appName = "DMLEdit"; _appName = "DMLEdit";
super.initialize(); super.initialize();
updatePreview(); updatePreview();
} }
/// create main menu /// create main menu
override protected MainMenu createMainMenu() { override protected MainMenu createMainMenu()
{
mainMenuItems = new MenuItem(); mainMenuItems = new MenuItem();
MenuItem fileItem = new MenuItem(new Action(1, "MENU_FILE")); MenuItem fileItem = new MenuItem(new Action(1, "MENU_FILE"));
fileItem.add(ACTION_FILE_NEW, ACTION_FILE_OPEN, fileItem.add(ACTION_FILE_NEW, ACTION_FILE_OPEN,
ACTION_FILE_EXIT); ACTION_FILE_EXIT);
mainMenuItems.add(fileItem); mainMenuItems.add(fileItem);
MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT")); MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT"));
editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE,
ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO,
ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_EDIT_TOGGLE_BLOCK_COMMENT, ACTION_DEBUG_START); ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_EDIT_TOGGLE_BLOCK_COMMENT, ACTION_DEBUG_START);
editItem.add(ACTION_EDIT_PREFERENCES); editItem.add(ACTION_EDIT_PREFERENCES);
mainMenuItems.add(editItem); mainMenuItems.add(editItem);
@ -127,9 +154,9 @@ class EditFrame : AppFrame {
return mainMenu; return mainMenu;
} }
/// create app toolbars /// create app toolbars
override protected ToolBarHost createToolbars() { override protected ToolBarHost createToolbars()
{
ToolBarHost res = new ToolBarHost(); ToolBarHost res = new ToolBarHost();
ToolBar tb; ToolBar tb;
tb = res.getOrAddToolbar("Standard"); tb = res.getOrAddToolbar("Standard");
@ -137,15 +164,18 @@ class EditFrame : AppFrame {
tb = res.getOrAddToolbar("Edit"); tb = res.getOrAddToolbar("Edit");
tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR, tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR,
ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT); ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT);
return res; return res;
} }
string _filename; string _filename;
void openSourceFile(string filename) { void openSourceFile(string filename)
{
import std.file; import std.file;
// TODO // TODO
if (exists(filename)) { if (exists(filename))
{
_filename = filename; _filename = filename;
window.windowCaption = toUTF32(filename); window.windowCaption = toUTF32(filename);
_editor.load(filename); _editor.load(filename);
@ -153,21 +183,25 @@ class EditFrame : AppFrame {
} }
} }
void saveSourceFile(string filename) { void saveSourceFile(string filename)
{
if (filename.length == 0) if (filename.length == 0)
filename = _filename; filename = _filename;
import std.file; import std.file;
_filename = filename; _filename = filename;
window.windowCaption = toUTF32(filename); window.windowCaption = toUTF32(filename);
_editor.save(filename); _editor.save(filename);
} }
bool onCanClose() { bool onCanClose()
{
// todo // todo
return true; return true;
} }
FileDialog createFileDialog(UIString caption, bool fileMustExist = true) { FileDialog createFileDialog(UIString caption, bool fileMustExist = true)
{
uint flags = DialogFlag.Modal | DialogFlag.Resizable; uint flags = DialogFlag.Modal | DialogFlag.Resizable;
if (fileMustExist) if (fileMustExist)
flags |= FileDialogFlag.FileMustExist; flags |= FileDialogFlag.FileMustExist;
@ -176,107 +210,120 @@ class EditFrame : AppFrame {
return dlg; return dlg;
} }
void saveAs() { void saveAs()
{
} }
/// override to handle specific actions /// override to handle specific actions
override bool handleAction(const Action a) { override bool handleAction(const Action a)
if (a) { {
switch (a.id) { if (a)
case IDEActions.FileExit: {
if (onCanClose()) switch (a.id)
window.close(); {
return true; case IDEActions.FileExit:
case IDEActions.HelpAbout: if (onCanClose())
window.showMessageBox(UIString.fromRaw("About DlangUI ML Editor"d), window.close();
UIString.fromRaw("DLangIDE\n(C) Vadim Lopatin, 2015\nhttp://github.com/buggins/dlangui\nSimple editor for DML code"d)); return true;
return true; case IDEActions.HelpAbout:
case IDEActions.FileNew: window.showMessageBox(UIString.fromRaw("About DlangUI ML Editor"d),
UIString caption; UIString.fromRaw(
caption = "Create new DML file"d; "DLangIDE\n(C) Vadim Lopatin, 2015\nhttp://github.com/buggins/dlangui\nSimple editor for DML code"d));
FileDialog dlg = createFileDialog(caption, false); return true;
dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml")); case IDEActions.FileNew:
dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*")); UIString caption;
dlg.dialogResult = delegate(Dialog dlg, const Action result) { caption = "Create new DML file"d;
if (result.id == ACTION_OPEN.id) { FileDialog dlg = createFileDialog(caption, false);
string filename = result.stringParam; dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml"));
_editor.text=""d; dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*"));
saveSourceFile(filename); dlg.dialogResult = delegate(Dialog dlg, const Action result) {
} if (result.id == ACTION_OPEN.id)
}; {
dlg.show(); string filename = result.stringParam;
return true; _editor.text = ""d;
case IDEActions.FileSave: saveSourceFile(filename);
if (_filename.length) {
saveSourceFile(_filename);
return true;
} }
UIString caption; };
caption = "Save DML File as"d; dlg.show();
FileDialog dlg = createFileDialog(caption, false); return true;
dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml")); case IDEActions.FileSave:
dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*")); if (_filename.length)
dlg.dialogResult = delegate(Dialog dlg, const Action result) { {
if (result.id == ACTION_OPEN.id) { saveSourceFile(_filename);
string filename = result.stringParam;
saveSourceFile(filename);
}
};
dlg.show();
return true; return true;
case IDEActions.FileOpen: }
UIString caption; UIString caption;
caption = "Open DML File"d; caption = "Save DML File as"d;
FileDialog dlg = createFileDialog(caption); FileDialog dlg = createFileDialog(caption, false);
dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml")); dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml"));
dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*")); dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*"));
dlg.dialogResult = delegate(Dialog dlg, const Action result) { dlg.dialogResult = delegate(Dialog dlg, const Action result) {
if (result.id == ACTION_OPEN.id) { if (result.id == ACTION_OPEN.id)
string filename = result.stringParam; {
openSourceFile(filename); string filename = result.stringParam;
} saveSourceFile(filename);
}; }
dlg.show(); };
return true; dlg.show();
case IDEActions.DebugStart: return true;
updatePreview(); case IDEActions.FileOpen:
return true; UIString caption;
case IDEActions.EditPreferences: caption = "Open DML File"d;
//showPreferences(); FileDialog dlg = createFileDialog(caption);
return true; dlg.addFilter(FileFilterEntry(UIString.fromRaw("DML files"d), "*.dml"));
default: dlg.addFilter(FileFilterEntry(UIString.fromRaw("All files"d), "*.*"));
return super.handleAction(a); dlg.dialogResult = delegate(Dialog dlg, const Action result) {
if (result.id == ACTION_OPEN.id)
{
string filename = result.stringParam;
openSourceFile(filename);
}
};
dlg.show();
return true;
case IDEActions.DebugStart:
updatePreview();
return true;
case IDEActions.EditPreferences:
//showPreferences();
return true;
default:
return super.handleAction(a);
} }
} }
return false; return false;
} }
/// override to handle specific actions state (e.g. change enabled state for supported actions) /// override to handle specific actions state (e.g. change enabled state for supported actions)
override bool handleActionStateRequest(const Action a) { override bool handleActionStateRequest(const Action a)
switch (a.id) { {
case IDEActions.HelpAbout: switch (a.id)
case IDEActions.FileNew: {
case IDEActions.FileOpen: case IDEActions.HelpAbout:
case IDEActions.DebugStart: case IDEActions.FileNew:
case IDEActions.EditPreferences: case IDEActions.FileOpen:
case IDEActions.FileSaveAs: case IDEActions.DebugStart:
case IDEActions.EditPreferences:
case IDEActions.FileSaveAs:
a.state = ACTION_STATE_ENABLED;
return true;
case IDEActions.FileSave:
if (_editor.content.modified)
a.state = ACTION_STATE_ENABLED; a.state = ACTION_STATE_ENABLED;
return true; else
case IDEActions.FileSave: a.state = ACTION_STATE_DISABLE;
if (_editor.content.modified) return true;
a.state = ACTION_STATE_ENABLED; default:
else return super.handleActionStateRequest(a);
a.state = ACTION_STATE_DISABLE;
return true;
default:
return super.handleActionStateRequest(a);
} }
} }
void updatePreview() { void updatePreview()
{
dstring dsource = _editor.text; dstring dsource = _editor.text;
string source = toUTF8(dsource); string source = toUTF8(dsource);
try { try
{
Widget w = parseML(source); Widget w = parseML(source);
if (statusLine) if (statusLine)
statusLine.setStatusText("No errors"d); statusLine.setStatusText("No errors"d);
@ -287,7 +334,9 @@ class EditFrame : AppFrame {
if (_highlightBackground) if (_highlightBackground)
w.backgroundColor = 0xC0C0C0C0; w.backgroundColor = 0xC0C0C0C0;
_preview.contentWidget = w; _preview.contentWidget = w;
} catch (ParserException e) { }
catch (ParserException e)
{
if (statusLine) if (statusLine)
statusLine.setStatusText(toUTF32("ERROR: " ~ e.msg)); statusLine.setStatusText(toUTF32("ERROR: " ~ e.msg));
_editor.setCaretPos(e.line, e.pos); _editor.setCaretPos(e.line, e.pos);
@ -307,9 +356,11 @@ class EditFrame : AppFrame {
protected bool _highlightBackground; protected bool _highlightBackground;
protected DMLSourceEdit _editor; protected DMLSourceEdit _editor;
protected ScrollWidget _preview; protected ScrollWidget _preview;
/// create app body widget /// create app body widget
override protected Widget createBody() override protected Widget createBody()
{ {
string currentWidget;
DockHost dockHost = new DockHost(); DockHost dockHost = new DockHost();
@ -324,17 +375,18 @@ class EditFrame : AppFrame {
auto registeredWidgetList = getRegisteredWidgetsList(); auto registeredWidgetList = getRegisteredWidgetsList();
registeredWidgetList.sort!("a < b"); registeredWidgetList.sort!("a < b");
foreach(const ref widget; registeredWidgetList) foreach (const ref widget; registeredWidgetList)
{ {
auto propertyListAdapter = new StringListAdapter(); auto propertyListAdapter = new StringListAdapter();
if ( auto meta = findWidgetMetadata(widget) ) if (auto meta = findWidgetMetadata(widget))
{ {
auto mp = meta.properties; auto mp = meta.properties;
mp.sort!("a.name < b.name"); mp.sort!("a.name < b.name");
foreach(const ref prop; mp) foreach (const ref prop; mp)
{ {
propertyListAdapter.add(UIString.fromRaw(prop.name ~ " [" ~ to!string(prop.type) ~ "]" )); propertyListAdapter.add(UIString.fromRaw(
propListsAdapters[widget] = propertyListAdapter; prop.name ~ " [" ~ to!string(prop.type) ~ "]"));
propListsAdapters[widget] = propertyListAdapter;
} }
} }
sla.add(UIString.fromRaw(widget)); sla.add(UIString.fromRaw(widget));
@ -342,15 +394,67 @@ class EditFrame : AppFrame {
widgetsList.adapter = sla; widgetsList.adapter = sla;
StringListAdapter origSla = new StringListAdapter();
for (int i = 0; i < sla.getItems.count; i++)
{
origSla.add(sla.items[i]);
}
StringListAdapter origProps = new StringListAdapter();
auto leftPanel = new VerticalLayout(); auto leftPanel = new VerticalLayout();
leftPanel.layoutHeight = FILL_PARENT; leftPanel.layoutHeight = FILL_PARENT;
widgetsList.minHeight=800; widgetsList.minHeight = 800;
propList.minHeight=600; propList.minHeight = 600;
leftPanel.addChild(new TextWidget().text("Widgets").backgroundColor(0xdddddd).minHeight(50) ); auto searchBox = new EditLine().text("").backgroundColor(0xffffff).minHeight(25);
searchBox.keyEvent = delegate(Widget w, KeyEvent e) {
string[] arr;
foreach (s; origSla.getItems)
arr ~= s;
arr = arr.filter!(x => x.toLower.canFind(searchBox.text.toLower)).array;
sla.clear();
foreach (string k; arr)
sla.add(UIString.fromRaw(k));
widgetsList.adapter = sla;
return false;
};
auto searchBoxProps = new EditLine().text("").backgroundColor(0xffffff).minHeight(25);
searchBoxProps.keyEvent = delegate(Widget w, KeyEvent e) {
if (currentWidget in propListsAdapters)
{
string[] arr;
foreach (s; origProps.getItems)
arr ~= s;
arr = arr.filter!(x => x.toLower.canFind(searchBoxProps.text.toLower)).array;
StringListAdapter sla = new StringListAdapter();
foreach (string k; arr)
sla.add(UIString.fromRaw(k));
propList.adapter = sla;
}
return false;
};
leftPanel.addChild(searchBox);
leftPanel.addChild(new TextWidget().text("Widgets").backgroundColor(0xdddddd).minHeight(25));
leftPanel.addChild(widgetsList); leftPanel.addChild(widgetsList);
leftPanel.addChild(new TextWidget().text("Widget properties").backgroundColor(0xdddddd).minHeight(50));
leftPanel.addChild(searchBoxProps);
leftPanel.addChild(new TextWidget().text("Widget properties")
.backgroundColor(0xdddddd).minHeight(50));
leftPanel.addChild(propList); leftPanel.addChild(propList);
auto leftDockWin = new DockWindow("left dock"); auto leftDockWin = new DockWindow("left dock");
@ -364,6 +468,21 @@ class EditFrame : AppFrame {
_editor = new DMLSourceEdit(); _editor = new DMLSourceEdit();
_editor.text = SAMPLE_SOURCE_CODE; _editor.text = SAMPLE_SOURCE_CODE;
_editor.keyEvent = delegate(Widget w, KeyEvent e) {
if (e.action == KeyAction.KeyUp)
{
if ((e.keyCode == KeyCode.DEL)
|| (e.flags == KeyFlag.LControl && e.keyCode == KeyCode.KEY_S)
|| (e.flags == KeyFlag.LControl && e.keyCode == KeyCode.KEY_V)
|| (e.flags == KeyFlag.LControl && e.keyCode == KeyCode.KEY_Z))
{
updatePreview();
}
}
return false;
};
auto editorDockWin = new DockWindow("editor"); auto editorDockWin = new DockWindow("editor");
editorDockWin.layoutWidth = makePercentSize(50); editorDockWin.layoutWidth = makePercentSize(50);
editorDockWin.bodyWidget = _editor; editorDockWin.bodyWidget = _editor;
@ -393,11 +512,13 @@ class EditFrame : AppFrame {
updatePreview(); updatePreview();
return true; return true;
}; };
widgetsList.itemClick = delegate (Widget source, int itemIndex){ widgetsList.itemClick = delegate(Widget source, int itemIndex) {
propList.adapter = propListsAdapters[to!string(widgetsList.selectedItem)]; currentWidget = to!string(widgetsList.selectedItem);
origProps = propListsAdapters[currentWidget];
propList.adapter = origProps;
return true; return true;
}; };
widgetsList.onItemDoubleClick = delegate (Widget source, int itemIndex) { widgetsList.onItemDoubleClick = delegate(Widget source, int itemIndex) {
auto caret = _editor.caretPos; auto caret = _editor.caretPos;
auto widgetClassName = widgetsList.selectedItem; auto widgetClassName = widgetsList.selectedItem;
EditOperation op = new EditOperation(EditAction.Replace, caret, widgetClassName); EditOperation op = new EditOperation(EditAction.Replace, caret, widgetClassName);
@ -428,15 +549,17 @@ class EditFrame : AppFrame {
} }
} }
alias onItemDoubleClickHandler = void delegate (Widget source, int itemIndex); alias onItemDoubleClickHandler = void delegate(Widget source, int itemIndex);
class WidgetsList : StringListWidget class WidgetsList : StringListWidget
{ {
onItemDoubleClickHandler onItemDoubleClick; onItemDoubleClickHandler onItemDoubleClick;
override bool onMouseEvent(MouseEvent event) { override bool onMouseEvent(MouseEvent event)
{
bool result = super.onMouseEvent(event); bool result = super.onMouseEvent(event);
if (event.doubleClick) { if (event.doubleClick)
{
if (onItemDoubleClick !is null) if (onItemDoubleClick !is null)
onItemDoubleClick(this, selectedItemIndex); onItemDoubleClick(this, selectedItemIndex);
} }
@ -445,7 +568,8 @@ class WidgetsList : StringListWidget
} }
/// entry point for dlangui based application /// entry point for dlangui based application
extern (C) int UIAppMain(string[] args) { extern (C) int UIAppMain(string[] args)
{
// embed non-standard resources listed in views/resources.list into executable // embed non-standard resources listed in views/resources.list into executable
embeddedResourceList.addResources(embedResourcesFromList!("resources.list")()); embeddedResourceList.addResources(embedResourcesFromList!("resources.list")());

2
src/dlangui/core/i18n.d
View File

@ -441,7 +441,7 @@ class UIStringTranslator {
return s; return s;
if (fallbackValue.length > 0) if (fallbackValue.length > 0)
return fallbackValue; return fallbackValue;
return "UNTRANSLATED: "d ~ toUTF32(id); return toUTF32(id);
} }
} }

850
src/dlangui/widgets/lists.d
View File

File diff suppressed because it is too large Load Diff