godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 19:41:11 +00:00
Code Releases Wiki Activity

Oops! Audio engine has vanished :D

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-15 16:06:14 -03:00
parent b24b52d56b
commit b400c69cd4
160 changed files with 618 additions and 24650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/editor_node.cpp
View File

@@ -279,7 +279,7 @@ void EditorNode::_notification(int p_what) {
editor_selection->update();
{
uint32_t p32 = AudioServer::get_singleton()->read_output_peak()>>8;
uint32_t p32 = 0;//AudioServer::get_singleton()->read_output_peak()>>8;
float peak = p32==0? -80 : Math::linear2db(p32 / 65535.0);
@@ -6647,13 +6647,13 @@ EditorNode::EditorNode() {
// editor_import_export->add_import_plugin( Ref<EditorSceneAnimationImportPlugin>( memnew(EditorSceneAnimationImportPlugin(this))));
editor_import_export->add_import_plugin( Ref<EditorMeshImportPlugin>( memnew(EditorMeshImportPlugin(this))));
editor_import_export->add_import_plugin( Ref<EditorFontImportPlugin>( memnew(EditorFontImportPlugin(this))));
editor_import_export->add_import_plugin( Ref<EditorSampleImportPlugin>( memnew(EditorSampleImportPlugin(this))));
// editor_import_export->add_import_plugin( Ref<EditorSampleImportPlugin>( memnew(EditorSampleImportPlugin(this))));
editor_import_export->add_import_plugin( Ref<EditorTranslationImportPlugin>( memnew(EditorTranslationImportPlugin(this))));
editor_import_export->add_import_plugin( Ref<EditorBitMaskImportPlugin>( memnew(EditorBitMaskImportPlugin(this))));
editor_import_export->add_export_plugin( Ref<EditorTextureExportPlugin>( memnew(EditorTextureExportPlugin)));
editor_import_export->add_export_plugin( Ref<EditorSampleExportPlugin>( memnew(EditorSampleExportPlugin)));
// editor_import_export->add_export_plugin( Ref<EditorSampleExportPlugin>( memnew(EditorSampleExportPlugin)));
editor_import_export->add_export_plugin( Ref<EditorSceneExportPlugin>( memnew(EditorSceneExportPlugin)));
@@ -6678,8 +6678,8 @@ EditorNode::EditorNode() {
add_editor_plugin( memnew( ShaderEditorPlugin(this,false) ) );*/
add_editor_plugin( memnew( CameraEditorPlugin(this) ) );
add_editor_plugin( memnew( SampleEditorPlugin(this) ) );
add_editor_plugin( memnew( SampleLibraryEditorPlugin(this) ) );
// add_editor_plugin( memnew( SampleEditorPlugin(this) ) );
// add_editor_plugin( memnew( SampleLibraryEditorPlugin(this) ) );
add_editor_plugin( memnew( ThemeEditorPlugin(this) ) );
add_editor_plugin( memnew( MultiMeshEditorPlugin(this) ) );
add_editor_plugin( memnew( MeshInstanceEditorPlugin(this) ) );

2
tools/editor/io_plugins/editor_mesh_import_plugin.cpp
View File

@@ -32,7 +32,7 @@
#include "tools/editor/editor_dir_dialog.h"
#include "tools/editor/editor_node.h"
#include "tools/editor/property_editor.h"
#include "scene/resources/sample.h"
//#include "scene/resources/sample.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "io/marshalls.h"

6
tools/editor/io_plugins/editor_sample_import_plugin.cpp
View File

@@ -31,12 +31,14 @@
#include "tools/editor/editor_dir_dialog.h"
#include "tools/editor/editor_node.h"
#include "tools/editor/property_editor.h"
#include "scene/resources/sample.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "io/marshalls.h"
#include "tools/editor/editor_settings.h"
#if 0
class _EditorSampleImportOptions : public Object {
GDCLASS(_EditorSampleImportOptions,Object);
@@ -923,3 +925,5 @@ Vector<uint8_t> EditorSampleExportPlugin::custom_export(String& p_path,const Ref
EditorSampleExportPlugin::EditorSampleExportPlugin() {
}
#endif

2
tools/editor/io_plugins/editor_sample_import_plugin.h
View File

@@ -29,6 +29,7 @@
#ifndef EDITOR_SAMPLE_IMPORT_PLUGIN_H
#define EDITOR_SAMPLE_IMPORT_PLUGIN_H
#if 0
#include "tools/editor/editor_import_export.h"
#include "scene/resources/font.h"
@@ -70,3 +71,4 @@ public:
};
#endif // EDITOR_SAMPLE_IMPORT_PLUGIN_H
#endif

2
tools/editor/io_plugins/editor_translation_import_plugin.cpp
View File

@@ -31,7 +31,7 @@
#include "tools/editor/editor_dir_dialog.h"
#include "tools/editor/editor_node.h"
#include "tools/editor/property_editor.h"
#include "scene/resources/sample.h"
//#include "scene/resources/sample.h"
#include "io/resource_saver.h"
#include "os/file_access.h"
#include "translation.h"

6
tools/editor/plugins/editor_preview_plugins.cpp
View File

@@ -32,7 +32,7 @@
#include "io/file_access_memory.h"
#include "os/os.h"
#include "scene/resources/material.h"
#include "scene/resources/sample.h"
//#include "scene/resources/sample.h"
#include "scene/resources/mesh.h"
#include "scene/resources/bit_mask.h"
#include "tools/editor/editor_scale.h"
@@ -521,7 +521,7 @@ EditorScriptPreviewPlugin::EditorScriptPreviewPlugin() {
}
///////////////////////////////////////////////////////////////////
#if 0
bool EditorSamplePreviewPlugin::handles(const String& p_type) const {
return ClassDB::is_type(p_type,"Sample");
@@ -788,7 +788,7 @@ EditorSamplePreviewPlugin::EditorSamplePreviewPlugin() {
}
#endif
///////////////////////////////////////////////////////////////////////////
bool EditorMeshPreviewPlugin::handles(const String& p_type) const {

4
tools/editor/plugins/editor_preview_plugins.h
View File

@@ -94,7 +94,7 @@ public:
EditorScriptPreviewPlugin();
};
#if 0
class EditorSamplePreviewPlugin : public EditorResourcePreviewGenerator {
public:
@@ -104,7 +104,7 @@ public:
EditorSamplePreviewPlugin();
};
#endif
class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator {
RID scenario;

4
tools/editor/plugins/sample_editor_plugin.cpp
View File

@@ -27,7 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "sample_editor_plugin.h"
#if 0
#include "io/resource_loader.h"
#include "globals.h"
#include "tools/editor/editor_settings.h"
@@ -447,4 +447,4 @@ SampleEditorPlugin::~SampleEditorPlugin()
{
}
#endif

4
tools/editor/plugins/sample_editor_plugin.h
View File

@@ -29,7 +29,7 @@
#ifndef SAMPLE_EDITOR_PLUGIN_H
#define SAMPLE_EDITOR_PLUGIN_H
#if 0
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "scene/audio/sample_player.h"
@@ -87,4 +87,6 @@ public:
};
#endif
#endif // SAMPLE_EDITOR_PLUGIN_H

4
tools/editor/plugins/sample_library_editor_plugin.cpp
View File

@@ -26,8 +26,9 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "sample_library_editor_plugin.h"
#if 0
#include "sample_library_editor_plugin.h"
#include "io/resource_loader.h"
#include "globals.h"
#include "tools/editor/editor_settings.h"
@@ -541,3 +542,4 @@ SampleLibraryEditorPlugin::SampleLibraryEditorPlugin(EditorNode *p_node) {
SampleLibraryEditorPlugin::~SampleLibraryEditorPlugin()
{
}
#endif

3
tools/editor/plugins/sample_library_editor_plugin.h
View File

@@ -30,7 +30,7 @@
#define SAMPLE_LIBRARY_EDITOR_PLUGIN_H
#if 0
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "scene/audio/sample_player.h"
@@ -104,4 +104,5 @@ public:
};
#endif
#endif // SAMPLE_LIBRARY_EDITOR_PLUGIN_H

5
tools/editor/plugins/sample_player_editor_plugin.cpp
View File

@@ -26,7 +26,11 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#if 0
#include "sample_player_editor_plugin.h"
#include "scene/resources/sample_library.h"
@@ -196,3 +200,4 @@ SamplePlayerEditorPlugin::~SamplePlayerEditorPlugin()
}
#endif

3
tools/editor/plugins/sample_player_editor_plugin.h
View File

@@ -29,6 +29,8 @@
#ifndef SAMPLE_PLAYER_EDITOR_PLUGIN_H
#define SAMPLE_PLAYER_EDITOR_PLUGIN_H
#if 0
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "scene/3d/spatial_sample_player.h"
@@ -84,4 +86,5 @@ public:
};
#endif
#endif // SAMPLE_PLAYER_EDITOR_PLUGIN_H

3
tools/editor/plugins/stream_editor_plugin.cpp
View File

@@ -28,7 +28,7 @@
/*************************************************************************/
#include "stream_editor_plugin.h"
#if 0
void StreamEditor::_notification(int p_what) {
@@ -146,3 +146,4 @@ StreamEditorPlugin::~StreamEditorPlugin()
{
}
#endif

3
tools/editor/plugins/stream_editor_plugin.h
View File

@@ -29,7 +29,7 @@
#ifndef STREAM_EDITOR_PLUGIN_H
#define STREAM_EDITOR_PLUGIN_H
#if 0
#include "tools/editor/editor_plugin.h"
#include "tools/editor/editor_node.h"
#include "scene/audio/stream_player.h"
@@ -81,3 +81,4 @@ public:
};
#endif // STREAM_EDITOR_PLUGIN_H
#endif

58
tools/editor/spatial_editor_gizmos.cpp
View File

@@ -953,28 +953,6 @@ LightSpatialGizmo::LightSpatialGizmo(Light* p_light){
set_spatial_node(p_light);
}
//////
void ListenerSpatialGizmo::redraw() {
clear();
add_unscaled_billboard(SpatialEditorGizmos::singleton->listener_icon, 0.05);
add_mesh(SpatialEditorGizmos::singleton->listener_line_mesh);
Vector<Vector3> cursor_points;
cursor_points.push_back(Vector3(0, 0, 0));
cursor_points.push_back(Vector3(0, 0, -1.0));
add_collision_segments(cursor_points);
}
ListenerSpatialGizmo::ListenerSpatialGizmo(Listener* p_listener){
set_spatial_node(p_listener);
listener = p_listener;
}
//////
@@ -1391,32 +1369,6 @@ SkeletonSpatialGizmo::SkeletonSpatialGizmo(Skeleton* p_skel) {
set_spatial_node(p_skel);
}
/////
void SpatialPlayerSpatialGizmo::redraw() {
clear();
if (splayer->cast_to<SpatialStreamPlayer>()) {
add_unscaled_billboard(SpatialEditorGizmos::singleton->stream_player_icon,0.05);
} else if (splayer->cast_to<SpatialSamplePlayer>()) {
add_unscaled_billboard(SpatialEditorGizmos::singleton->sample_player_icon,0.05);
}
}
SpatialPlayerSpatialGizmo::SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer){
set_spatial_node(p_splayer);
splayer=p_splayer;
}
/////
void RoomSpatialGizmo::redraw() {
@@ -3165,11 +3117,7 @@ Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {
return lsg;
}
if (p_spatial->cast_to<Listener>()) {
Ref<ListenerSpatialGizmo> misg = memnew(ListenerSpatialGizmo(p_spatial->cast_to<Listener>()));
return misg;
}
if (p_spatial->cast_to<Camera>()) {
@@ -3227,12 +3175,6 @@ Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {
return misg;
}
if (p_spatial->cast_to<SpatialPlayer>()) {
Ref<SpatialPlayerSpatialGizmo> misg = memnew( SpatialPlayerSpatialGizmo(p_spatial->cast_to<SpatialPlayer>()) );
return misg;
}
if (p_spatial->cast_to<CollisionShape>()) {
Ref<CollisionShapeSpatialGizmo> misg = memnew( CollisionShapeSpatialGizmo(p_spatial->cast_to<CollisionShape>()) );

32
tools/editor/spatial_editor_gizmos.h
View File

@@ -35,8 +35,6 @@
#include "scene/3d/listener.h"
#include "scene/3d/camera.h"
#include "scene/3d/position_3d.h"
#include "scene/3d/spatial_sample_player.h"
#include "scene/3d/spatial_stream_player.h"
#include "scene/3d/test_cube.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/body_shape.h"
@@ -146,19 +144,6 @@ public:
};
class ListenerSpatialGizmo : public EditorSpatialGizmo {
GDCLASS(ListenerSpatialGizmo, EditorSpatialGizmo);
Listener* listener;
public:
void redraw();
ListenerSpatialGizmo(Listener* p_listener = NULL);
};
class CameraSpatialGizmo : public EditorSpatialGizmo {
GDCLASS(CameraSpatialGizmo,EditorSpatialGizmo);
@@ -220,23 +205,6 @@ public:
};
class SpatialPlayerSpatialGizmo : public EditorSpatialGizmo {
GDCLASS(SpatialPlayerSpatialGizmo,EditorSpatialGizmo);
SpatialPlayer* splayer;
public:
void redraw();
SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer=NULL);
};
class TestCubeSpatialGizmo : public EditorSpatialGizmo {
GDCLASS(TestCubeSpatialGizmo,EditorSpatialGizmo);