-
Notifications
You must be signed in to change notification settings - Fork 341
Change "World Wind" to "WorldWind" #129
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.
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
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
Next
Next commit
Change "World Wind" to "WorldWind"
- All instances of "World Wind" in the source code and supporting documents have been changed to "WorldWind"
- Loading branch information
commit 0685d613ba96aa0feb638559658eec6ba59f495e
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| <img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/> | ||
|
|
||
| # World Wind Java | ||
| # WorldWind Java | ||
|
|
||
| [](https://travis-ci.org/NASAWorldWind/WorldWindJava) | ||
|
|
||
| 3D virtual globe API for desktop Java, developed by NASA. Provides a geographic context with high-resolution terrain, for visualizing geographic or geo-located information in 3D and 2D. Developers can customize the globe's terrain and imagery. Provides a collection of shapes for displaying and interacting with geographic data and representing a range of geometric objects. | ||
|
|
||
| - [worldwind.arc.nasa.gov](https://worldwind.arc.nasa.gov) has setup instructions, developers guides, API documentation and more | ||
| - [World Wind Forum](https://forum.worldwindcentral.com) provides help from the World Wind community | ||
| - [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA World Wind development team | ||
| - [WorldWind Forum](https://forum.worldwindcentral.com) provides help from the WorldWind community | ||
| - [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA WorldWind development team | ||
|
|
||
| ## Releases and Roadmap | ||
|
|
||
| Official World Wind Java releases have the latest stable features, enhancements and bug fixes ready for production use. | ||
| Official WorldWind Java releases have the latest stable features, enhancements and bug fixes ready for production use. | ||
|
|
||
| - [GitHub Releases](https://github.com/NASAWorldWind/WorldWindJava/releases/) documents official releases | ||
| - [GitHub Milestones](https://github.com/NASAWorldWind/WorldWindJava/milestones) documents upcoming releases and the development roadmap | ||
|
|
@@ -22,15 +22,15 @@ Official World Wind Java releases have the latest stable features, enhancements | |
|
|
||
| ###### From a Web Browser | ||
|
|
||
| - [World Wind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows World Wind's basic capabilities | ||
| - [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities | ||
| - [Java Demos](https://goworldwind.org/demos) has a complete list of example apps | ||
|
|
||
| ###### From a Windows Development Environment | ||
|
|
||
| - Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest) | ||
| - Open the Command Prompt | ||
| ```bash | ||
| cd [World Wind release] | ||
| cd [WorldWind release] | ||
| run-demo.bat | ||
| ``` | ||
|
|
||
|
|
@@ -39,21 +39,21 @@ run-demo.bat | |
| - Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest) | ||
| - Open the Terminal app | ||
| ```bash | ||
| cd [World Wind release] | ||
| cd [WorldWind release] | ||
| sh run-demo.bash | ||
| ``` | ||
|
|
||
| ###### Troubleshooting | ||
|
|
||
| World Wind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date | ||
| WorldWind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date | ||
| graphics drivers. On Windows, visit your graphics card manufacturer's web site for the latest driver: NVIDIA, ATI or | ||
| Intel. The drivers are typically under a link named Downloads or Support. If you're using a laptop, the latest drivers | ||
| are found at the laptop manufacturer's web site. | ||
|
|
||
| ## JOGL Native Binaries | ||
|
|
||
| JOGL performs runtime extraction of native binaries. Some deployment situations may not allow this because it extracts | ||
| the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying World Wind | ||
| the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying WorldWind | ||
| Java's JOGL distribution to load native binaries directly from the library path instead of dynamically using the native | ||
| binary JAR files as follows: | ||
|
|
||
|
|
@@ -69,7 +69,7 @@ binary JAR files as follows: | |
|
|
||
| ## License | ||
|
|
||
| NASA WORLD WIND | ||
| NASA WorldWind | ||
|
||
|
|
||
| Copyright (C) 2001 United States Government | ||
| as represented by the Administrator of the | ||
|
|
@@ -90,7 +90,7 @@ binary JAR files as follows: | |
|
|
||
| Government Agency: National Aeronautics and Space Administration (NASA) | ||
| Government Agency Original Software Designation: ARC-15166-1 | ||
| Government Agency Original Software Title: NASA World Wind | ||
| Government Agency Original Software Title: NASA WorldWind | ||
| User Registration Requested. Please send email with your contact information to [email protected] | ||
| Government Agency Point of Contact for Original Software: [email protected] | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change needed: This file has a conflict with a develop branch.