Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support damcon team control #12

Open
abrindam opened this issue Jan 10, 2016 · 2 comments
Open

Support damcon team control #12

abrindam opened this issue Jan 10, 2016 · 2 comments
Labels
enhancement parity

Comments

@abrindam
Copy link
Owner

Will require displaying 3D model of ship and allowing user to interact with it.
jacobmaxfrank added a commit that referenced this issue Jan 11, 2016
@jacobmaxfrank
Add 3D models and README with some WIP info on 3D in Java
bfcf548 
WIP related to #12
abrindam pushed a commit that referenced this issue Jan 11, 2016
Add Java3D. Modify .obj file to be compatible with Java3D.
e99109a 
Give up on not checking in dependencies.

WIP on #12
jacobmaxfrank added a commit that referenced this issue Jan 11, 2016
@jacobmaxfrank
WIP #12: Added DamconCanvas, wireframed model, embedded in main windo…
9a9d881 
…w/JFrame

- Moved existing UI down to mimic built-in engineering console and make
  room for damcon and other sliders
- The current process of creating a J3D Universe generates a Viewer
  which in turn generates its own JFrame (because it wasn't given a
  Canvas).  We need to figure out how the default canvas is generated,
  make one ourselves, and pass that through (WIP function checked in
  as well but it doesn't work). In the worst case, we might be able to
  pass the J3D JFrame through to the console manager and just reuse it.
jacobmaxfrank added a commit that referenced this issue Jan 12, 2016
@jacobmaxfrank
WIP #12: Hide extra window J3D spawns
b14cfe3
jacobmaxfrank added a commit that referenced this issue Jan 12, 2016
@jacobmaxfrank
WIP #12: Make DAMCON a class, enable mouse wheel zooming with minimum…
ae924e0 
… radius
jacobmaxfrank added a commit that referenced this issue Jan 12, 2016
@jacobmaxfrank
WIP #12: Add rotation
298b34d
@jacobmaxfrank jacobmaxfrank reopened this Jan 12, 2016
jacobmaxfrank added a commit that referenced this issue Jan 13, 2016
@jacobmaxfrank
WIP #12: Fix zoom bug, clamp rotation rate correctly
69131a8
jacobmaxfrank added a commit that referenced this issue Jan 13, 2016
@jacobmaxfrank
WIP #12, general bugfixes: fix key listening, add scroll support
f9bb06d 
- Damcon's Canvas3D now gets keylisteners for sliders.  It was somehow
  intercepting them and no keys were getting through when the
  keylistener was added to the slider itself anymore (no idea why).
- Scrolling your middle mouse wheel (or trackpad) while hovering over a
  slider moves the slider (shift controls power/coolant the same was as
  it does for keyboard shortcuts).
jacobmaxfrank added a commit that referenced this issue Jan 13, 2016
@jacobmaxfrank
WIP #12: add maximum camera zoom-out/orbit distance
0262dbc 
- Also remove out-of-date comment
jacobmaxfrank added a commit that referenced this issue Jan 13, 2016
@jacobmaxfrank
WIP #12, etc.: duplicate + reserved keys, improve key event handling
35cd4b4 
- Centralize key event dispatch.  The J3D window was stealing focus so
  while mouse events went to it (based on coordinates presumably), key
  events were not.  I made it not focusable and send key events out from
  UserInterfaceFrame (just to itself and to the sliders).
- Disallow overriding reserved keys
- Disallow duplicate key bindings
- Enforce that custom key bindings which override defaults also specify
  a new value for the overriden default key
- Document some of the above (still need reserved key documentation)
jacobmaxfrank added a commit that referenced this issue Jan 15, 2016
@jacobmaxfrank
WIP #12, etc.: Layout rearrangement, misc. fixes
ed8f9c8 
- Moved existing UI down to make more room for DAMCON 3D view
- New default camera view and minimum zoom radius
- Coolant stack now displayed next to sliders to save space; new layout logic
- New fonts and colors
jacobmaxfrank added a commit that referenced this issue Jan 16, 2016
@jacobmaxfrank
WIP #12: enable anti-aliasing
7305ee2
jacobmaxfrank added a commit that referenced this issue Jan 16, 2016
@jacobmaxfrank
WIP #12: use nicest transparency algorithm; also fix window size
a072aba 
- We really don't want to deal with window resizing right now!
jacobmaxfrank added a commit that referenced this issue Jan 16, 2016
@jacobmaxfrank
WIP #12: tap the tilde key to toggle between dots and lines mode
1dd583a 
- This can be used as an "on-hit" damage effect
jacobmaxfrank added a commit that referenced this issue Jan 17, 2016
@jacobmaxfrank
WIP #12: Add damage shake effect
abf7c56
abrindam pushed a commit that referenced this issue Jan 17, 2016
Load ship stats from files so that system health and node health (issue
f6faf68 
#12) can be calculated
abrindam pushed a commit that referenced this issue Jan 17, 2016
Further API work for #12: Add API to get list of nodes with full data…
7b12697 
…, including graphical coordinates and which system they belong to
jacobmaxfrank added a commit that referenced this issue Jan 17, 2016
@jacobmaxfrank
WIP #12: internal ship nodes!
875669f 
Also:
- Fix null check when client not loaded into console
- WIP picking (not yet functional)
- New wireframe transparency
- And much, much more!
abrindam pushed a commit that referenced this issue Jan 18, 2016
WIP #12: Add simulation of damage when running in fake mode. Overheat…
bd60f17 
…ing will now cause damage which will be displayed in 3D model
abrindam pushed a commit that referenced this issue Jan 18, 2016
WIP #12: Add API to query connection between vessel nodes
e967b6e
abrindam pushed a commit that referenced this issue Jan 18, 2016
WIP #12: Add API to query connection between vessel nodes (whoops, sh…
b701230 
…ould have tested first!)
jacobmaxfrank added a commit that referenced this issue Jan 18, 2016
@jacobmaxfrank
WIP #12: track and render internal hallways/connections
24659a4
jacobmaxfrank added a commit that referenced this issue Jan 18, 2016
@jacobmaxfrank
WIP #12, etc.: Refactor of shared coloring and Internal code
ee612bd
abrindam pushed a commit that referenced this issue Jan 18, 2016
WIP #12: Show damcon teams on ship view
03e8f02
abrindam pushed a commit that referenced this issue Jan 18, 2016
WIP #12: Add API for moving damcon teams
453f44c
jacobmaxfrank added a commit that referenced this issue Jan 18, 2016
@jacobmaxfrank
WIP #12: Picking WIP, works for nodes
07c6fb0 
- Works for nodes, untested on DAMCON, not working for connections between
  nodes (and I'm not sure if it should)
- Some WIP stuff is marked with "TODO: > ", so please leave those
  around until I get the chance to clean them updatePos
- I've moved some TODOs around and added categories for them (several
  need to be made into issues)
jacobmaxfrank added a commit that referenced this issue Jan 18, 2016
@jacobmaxfrank
WIP #12: rename InternalHallway to InternalConnection (non-pickable)
5bf7764 
- Hallway is actually the term for internal nodes without systems, hence
  the renaming
- Turns out you can't pick the inter-node connections in the real client
jacobmaxfrank added a commit that referenced this issue Jan 18, 2016
@jacobmaxfrank
WIP #12: Further refactor of Internals
dde81cc 
- I still haven't tested DAMCON selectability.  I'll try adding it to
  the FakeEngineeringConsoleManager if I have a chance.
- The DAMCON team rendering currently shares a Sphere with the internal
  nodes, but they should probably be a box or something.
- See TODOs for many other WIP/unimplemented features
jacobmaxfrank added a commit that referenced this issue Jan 19, 2016
@jacobmaxfrank
WIP #12: Damcon teams are pickable.
0d4c4db 
- They only start showing up when you first change the power level,
  which presumably fires an onChange() console event. That's actually
  fine because it's good to test their addition.
- I don't see the DAMCON team moving; I assume that's not yet
  implemented.
- I made them blue temporarily.  They should have coloration similar to
  systems but have a box or billboard rather than a sphere as a model
  before I start using the same colors as the nodes.
- Also definitely need an onHover effect.  It's easy to know what you're
  hovering over, but without billboards, effects are going to be limited
  to changes in transparency or lighting.
- Whatever we do for "damcon team is selected" -- flashing or otherwise
  -- needs to be distinct from the on-hover effect.
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: Hover and selection both set full opacity
ca21ce9 
Also refactored picking and appearance update
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: Selection/hover minor refactor
1a11189
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: add light, selection effect
60d9494 
-Selectables spelling
-Added point light which follows camera
-Set material coloration on selected items for light reflection effect

Note that internal system nodes are currently selectable for testing; in
the next version only DAMCON teams are selectable.
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: correct DAMCON team selection rendering, alpha tweaks
d30e90c
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: DAMCON orders UI portion done; systems no longer selectable
e086ff4
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: issue DAMCON orders via EngineringConsoleManager
c96a811 
- I haven't tested it on a live server yet
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: bugfix for moving when no team selected
72d9854 
- DAMCON team movement orders seem to work, although the team then goes
  haywire shortly thereafter
- Selection when a DAMCON team shares a node location with a system is
  not yet fixed (picking should be only damcon teams when selected ==
  null and prioritize DAMCON teams when selected != null)
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: clear selection when issuing DAMCON orders
a26c9fe
jacobmaxfrank added a commit that referenced this issue Jan 30, 2016
@jacobmaxfrank
WIP #12: Sort picks
2b0c702 
- DAMCON teams get first priority
- After that, the nearest node is picked
abrindam pushed a commit that referenced this issue Jan 31, 2016
WIP #12: Remove window hack
92ed0c0
jacobmaxfrank added a commit that referenced this issue Jan 31, 2016
@jacobmaxfrank
WIP #12: For now, DAMCONs are blue and bigger spheres
8465b59
jacobmaxfrank added a commit that referenced this issue Feb 2, 2016
@jacobmaxfrank
WIP #12: actually check in energy slider
3d1aab9
@abrindam abrindam mentioned this issue Feb 2, 2016
Closed
jacobmaxfrank added a commit that referenced this issue Feb 15, 2016
@jacobmaxfrank
WIP #12: Massive refactor to support billboards
71db6aa 
- No more 3D shapes except as billboard hosts
- All new icons; reorganized art tree
- Cleanup camera rotation
- Manually point billboards at camera
- Remove lighting
jacobmaxfrank added a commit that referenced this issue Feb 16, 2016
@jacobmaxfrank
WIP #6, #12: Add DAMCON selection sound effect for testing
ce3c0fe 
- Generated sound with the following steps:
1) Install Audacity with FFMPEG 2.2.2 plugin (http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#ffdown).
2) Record and trim audio.
3) Export audio.  Select the AMR file type and 4.75 kbps bit rate.
4) Import AMR file into Audacity, then repeat (3).
5) Repeat (4) until there's enough distortion (I did just two rounds).
6) Export audio as Microsoft 16-bit WAV.

- Also extract hardcoded HUD icon paths
jacobmaxfrank added a commit that referenced this issue Feb 17, 2016
@jacobmaxfrank
WIP #6, #12: rewrite AudioManager with queue system
bc65065 
- Also added selection voice clips
- playSound is still around for immediately playing a sound; queueSound
  is used to play sounds in sequence with no overlap
jacobmaxfrank added a commit that referenced this issue Feb 17, 2016
@jacobmaxfrank
WIP #6, #12: Add order responses and demonstrate randomized lines
c82a34d
abrindam pushed a commit that referenced this issue Aug 7, 2016
WIP #12: Fix crash when node health changes to 100%
9e3b4f4
@abrindam
Copy link
Owner Author

abrindam commented Aug 7, 2016

@jacobmaxfrank: Just fixed a crash due to 100% node health causing an index of 10 into the texture array, and we only have textures 0-9 current. Quick fix was to clamp possible indexes to max of 9, but this will cause health of 90-100% to be rendered the same color. May want to come up with a better solution.

@abrindam
Copy link
Owner Author

Remaining work:

  • Ability to toggle autonomous damcon teams
  • Ability to see number of team members per team (onHover?)
  • Number of available damcon teams
  • Ability to identify which system a node belongs to (onHover?)

abrindam pushed a commit that referenced this issue Sep 18, 2016
WIP #12: Exposed APIs for getting and setting auto damcon on/off
b8ace3e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement parity
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jacobmaxfrank @abrindam